December 2014 - Wine-Commits

Martin Storsjo : api-ms-win-core-processthreads-l1-1-2: Add stub dll.
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: 73b53905cd0c637f839c42fc962abe9f4d8b5b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b53905cd0c637f839c42fc9… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:05 2014 +0200 api-ms-win-core-processthreads-l1-1-2: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-2.spec | 70 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 75 insertions(+) diff --git a/configure b/configure index e8b75a8..3ddeb77 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 +enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 @@ -16790,6 +16791,7 @@ wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_named wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 +wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 diff --git a/configure.ac b/configure.ac index 15d4dee..61bc2ad 100644 --- a/configure.ac +++ b/configure.ac @@ -2666,6 +2666,7 @@ WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in new file mode 100644 index 0000000..709073d --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-2.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec new file mode 100644 index 0000000..6894ce8 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -0,0 +1,70 @@ +@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA +@ stub CreateProcessAsUserW +@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW +@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread +@ stub CreateRemoteThreadEx +@ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread +@ stub DeleteProcThreadAttributeList +@ stdcall ExitProcess(long) kernel32.ExitProcess +@ stdcall ExitThread(long) kernel32.ExitThread +@ stdcall FlushInstructionCache(long long long) kernel32.FlushInstructionCache +@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess +@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId +@ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber +@ stub GetCurrentProcessorNumberEx +@ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread +@ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId +@ stub GetCurrentThreadStackLimits +@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess +@ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread +@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass +@ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount +@ stdcall GetProcessId(long) kernel32.GetProcessId +@ stub GetProcessIdOfThread +@ stub GetProcessMitigationPolicy +@ stdcall GetProcessPriorityBoost(long ptr) kernel32.GetProcessPriorityBoost +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW +@ stdcall GetSystemTimes(ptr ptr ptr) kernel32.GetSystemTimes +@ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext +@ stdcall GetThreadIOPendingFlag(long ptr) kernel32.GetThreadIOPendingFlag +@ stdcall GetThreadId(ptr) kernel32.GetThreadId +@ stub GetThreadIdealProcessorEx +@ stub GetThreadInformation +@ stdcall GetThreadPriority(long) kernel32.GetThreadPriority +@ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost +@ stdcall GetThreadTimes(long ptr ptr ptr ptr) kernel32.GetThreadTimes +@ stub InitializeProcThreadAttributeList +@ stub IsProcessCritical +@ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent +@ stdcall OpenProcess(long long long) kernel32.OpenProcess +@ stub OpenProcessToken +@ stdcall OpenThread(long long long) kernel32.OpenThread +@ stub OpenThreadToken +@ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId +@ stub QueryProcessAffinityUpdateMode +@ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC +@ stdcall ResumeThread(long) kernel32.ResumeThread +@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass +@ stub SetProcessAffinityUpdateMode +@ stub SetProcessMitigationPolicy +@ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost +@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters +@ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext +@ stub SetThreadIdealProcessorEx +@ stub SetThreadInformation +@ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority +@ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost +@ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee +@ stub SetThreadToken +@ stdcall SuspendThread(long) kernel32.SuspendThread +@ stdcall SwitchToThread() kernel32.SwitchToThread +@ stdcall TerminateProcess(long long) kernel32.TerminateProcess +@ stdcall TerminateThread(long long) kernel32.TerminateThread +@ stdcall TlsAlloc() kernel32.TlsAlloc +@ stdcall TlsFree(long) kernel32.TlsFree +@ stdcall TlsGetValue(long) kernel32.TlsGetValue +@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue +@ stub UpdateProcThreadAttribute diff --git a/tools/make_specfiles b/tools/make_specfiles index 226f1ba..411f65e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -158,6 +158,7 @@ my @dll_groups = "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-sysinfo-l1-2-1", + "api-ms-win-core-processthreads-l1-1-2", ], [ "ole32",

1 0

Sebastian Lackner : wintrust: Reset data->pWintrustData->u.pFile-> hFile after closing handle.
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: 4b7ec8266340b6889c0843c5b33a5ea3ffcfe23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7ec8266340b6889c0843c5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 25 21:26:54 2014 +0100 wintrust: Reset data->pWintrustData->u.pFile->hFile after closing handle. --- dlls/wintrust/softpub.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 358ba01..4e8582e 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -1209,7 +1209,11 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) if (data->fOpenedFile && data->pWintrustData->dwUnionChoice == WTD_CHOICE_FILE && data->pWintrustData->u.pFile) + { CloseHandle(data->pWintrustData->u.pFile->hFile); + data->pWintrustData->u.pFile->hFile = INVALID_HANDLE_VALUE; + data->fOpenedFile = FALSE; + } return S_OK; }

1 0

Nikolay Sivov : dwrite: Make fonts installed in Fonts dir accessible through system collection.
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: fe81deae10a41d0d72a8abfb7e92af7108c3476e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe81deae10a41d0d72a8abfb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 1 13:22:51 2014 +0300 dwrite: Make fonts installed in Fonts dir accessible through system collection. --- dlls/dwrite/font.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5e82b81..135ea4d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1660,8 +1660,8 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); DWORD ret, type, count; + WCHAR *filename; HRESULT hr; - BYTE *data; *file = NULL; @@ -1671,17 +1671,30 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil if (RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, NULL, &count)) return E_FAIL; - if (!(data = heap_alloc(count))) + if (!(filename = heap_alloc(count))) return E_OUTOFMEMORY; - ret = RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, data, &count); + ret = RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, (BYTE*)filename, &count); if (ret) { - heap_free(data); + heap_free(filename); return E_FAIL; } - hr = IDWriteFactory_CreateFontFileReference(enumerator->factory, (WCHAR*)data, NULL, file); - heap_free(data); + /* Fonts installed in 'Fonts' system dir don't get full path in registry font files cache */ + if (!strchrW(filename, '\\')) { + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; + WCHAR fullpathW[MAX_PATH]; + + GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); + strcatW(fullpathW, fontsW); + strcatW(fullpathW, filename); + + hr = IDWriteFactory_CreateFontFileReference(enumerator->factory, fullpathW, NULL, file); + } + else + hr = IDWriteFactory_CreateFontFileReference(enumerator->factory, filename, NULL, file); + + heap_free(filename); return hr; }

1 0

Stefan Dösinger : d3d8: Refuse to reset a lost device.
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: 8dd44e28013e531293b2e060254684562f7171fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd44e28013e531293b2e0602… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 1 22:46:47 2014 +0100 d3d8: Refuse to reset a lost device. --- dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/tests/device.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4c17e7c..659cae6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -647,6 +647,12 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); + if (device->device_state == D3D8_DEVICE_STATE_LOST) + { + WARN("App not active, returning D3DERR_DEVICELOST.\n"); + return D3DERR_DEVICELOST; + } + wined3d_mutex_lock(); if (device->vertex_buffer) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6a4dcc2..33d3cd5 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6863,6 +6863,17 @@ static void test_lost_device(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window.\n"); + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0

André Hentschel : quartz: Remove unused code (Clang).
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: bf12844bf19ba15a10271cb7f1feec802933eeca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf12844bf19ba15a10271cb7f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:14 2014 +0100 quartz: Remove unused code (Clang). --- dlls/quartz/acmwrapper.c | 5 ----- dlls/quartz/avidec.c | 5 ----- dlls/quartz/dsoundrender.c | 1 - dlls/quartz/mpegsplit.c | 1 - 4 files changed, 12 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index cd0b0d8..5bc0d8f 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -58,11 +58,6 @@ static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); } -static inline ACMWrapperImpl *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter.IBaseFilter_iface); -} - static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) { ACMWrapperImpl* This = impl_from_TransformFilter(tf); diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 30da6fa..5047809 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -52,11 +52,6 @@ typedef struct AVIDecImpl static const IBaseFilterVtbl AVIDec_Vtbl; -static inline AVIDecImpl *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter.IBaseFilter_iface); -} - static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) { return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 2914b15..9f96654 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -46,7 +46,6 @@ static const REFERENCE_TIME DSoundRenderer_Max_Fill = 150 * 10000; static const IBaseFilterVtbl DSoundRender_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; -static const IMediaSeekingVtbl IMediaSeeking_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index de03d17..6f09822 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -96,7 +96,6 @@ static int MPEGSplitter_head_check(const BYTE *header) } static const WCHAR wszAudioStream[] = {'A','u','d','i','o',0}; -static const WCHAR wszVideoStream[] = {'V','i','d','e','o',0}; static const DWORD freqs[10] = { 44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000, 0 };

1 0

André Hentschel : ole32/tests: Remove unused variable (Clang).
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: 065e4770f00ccf387e01284ab7721b968a582c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=065e4770f00ccf387e01284ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:09 2014 +0100 ole32/tests: Remove unused variable (Clang). --- dlls/ole32/tests/moniker.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 695f67a..3dd8bd2 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -56,14 +56,6 @@ static char const * const *expected_method_list; static const WCHAR wszFileName1[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','1','.','d','o','c',0}; static const WCHAR wszFileName2[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','2','.','d','o','c',0}; -static const CLSID CLSID_WineTest = -{ /* 9474ba1a-258b-490b-bc13-516e9239ace0 */ - 0x9474ba1a, - 0x258b, - 0x490b, - {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe0} -}; - static const CLSID CLSID_TestMoniker = { /* b306bfbc-496e-4f53-b93e-2ff9c83223d7 */ 0xb306bfbc,

1 0

André Hentschel : msxml3/tests: Remove unused code ( Clang).
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: 1463325797d50638b27dc95b34c86b4182787839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1463325797d50638b27dc95b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:58:01 2014 +0100 msxml3/tests: Remove unused code (Clang). --- dlls/msxml3/tests/domdoc.c | 7 +------ dlls/msxml3/tests/saxreader.c | 9 +-------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b768260..1a73771 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -410,11 +410,6 @@ static const WCHAR szComplete1[] = { static const WCHAR szComplete2[] = { '<','?','x','m','l',' ', 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','o','>','<','/','o','>','\n',0 -}; -static const WCHAR szComplete3[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', '<','a','>','<','/','a','>','\n',0 }; static const char complete4A[] = @@ -1368,7 +1363,7 @@ if (0) /* try to load something else simple and valid */ b = VARIANT_FALSE; - str = SysAllocString( szComplete3 ); + str = SysAllocString( szComplete2 ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 882e855..75354c5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -310,13 +310,6 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct call_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static const char *get_event_name(CH event) { return event_names[event]; @@ -2895,7 +2888,7 @@ static void test_mxwriter_handlers(void) HRESULT hr; int i; - static const REFIID riids[] = + static REFIID riids[] = { &IID_ISAXContentHandler, &IID_ISAXLexicalHandler,

1 0

André Hentschel : msi/tests: Remove unused variables (Clang).
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: 1c3179b21b0f2935e6f0803cda95547919ffff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3179b21b0f2935e6f0803cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:30 2014 +0100 msi/tests: Remove unused variables (Clang). --- dlls/msi/tests/install.c | 56 ------------------------------------------------ 1 file changed, 56 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a99a4c4..7c4544a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -563,35 +563,11 @@ static const CHAR cie_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\t "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; -static const CHAR ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "RunInstall\t\t1600\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; - -static const CHAR ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" - "CustomAction\tAction\n" - "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; - static const CHAR ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" "maximus\t{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; -static const CHAR ci2_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" - "s72\tS38\ts72\ti2\tS255\tS72\n" - "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\tUILevel=3 AND MYPROP=5\taugustus\n"; - static const CHAR ci2_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" "FeatureComponents\tFeature_\tComponent_\n" @@ -659,13 +635,6 @@ static const CHAR amp_component_dat[] = "Component\tComponentId\tDirectory_\tAtt "Component\tComponent\n" "augustus\t\tMSITESTDIR\t0\tMYPROP=2718 and MyProp=42\taugustus\n"; -static const CHAR rem_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" - "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" - "File\tFile\n" - "hydrogen\thydrogen\thydrogen\t0\t\t\t8192\t1\n" - "helium\thelium\thelium\t0\t\t\t8192\t1\n" - "lithium\tlithium\tlithium\t0\t\t\t8192\t1"; - static const CHAR rem_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" @@ -1543,31 +1512,6 @@ static const msi_table cie_tables[] = ADD_TABLE(property), }; -static const msi_table ci_tables[] = -{ - ADD_TABLE(ci_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(rof_feature_comp), - ADD_TABLE(rof_file), - ADD_TABLE(ci_install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), - ADD_TABLE(ci_custom_action), -}; - -static const msi_table ci2_tables[] = -{ - ADD_TABLE(ci2_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(ci2_feature_comp), - ADD_TABLE(ci2_file), - ADD_TABLE(install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), -}; - static const msi_table tp_tables[] = { ADD_TABLE(tp_component),

1 0

Marcus Meissner : ntoskrnl.exe: Added IoBuildSynchronousFsdRequest and IoGetAttachedDevice stubs.
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: c0816eabff42724de0091613bd3a304c7c497a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0816eabff42724de0091613b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 2 09:22:10 2014 +0100 ntoskrnl.exe: Added IoBuildSynchronousFsdRequest and IoGetAttachedDevice stubs. --- dlls/ntoskrnl.exe/ntoskrnl.c | 51 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a31b186..78df9f1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -532,6 +532,43 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG IoControlCode, } +/********************************************************** + * IoBuildSynchronousFsdRequest (NTOSKRNL.EXE.@) + */ +PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, + PVOID buffer, ULONG length, PLARGE_INTEGER startoffset, + PKEVENT event, PIO_STATUS_BLOCK iosb) +{ + PIRP irp; + struct IrpInstance *instance; + PIO_STACK_LOCATION irpsp; + + FIXME("(%d %p %p %d %p %p %p) stub\n", majorfunc, device, buffer, length, startoffset, event, iosb); + + irp = IoAllocateIrp( device->StackSize, FALSE ); + if (irp == NULL) + return NULL; + + instance = HeapAlloc( GetProcessHeap(), 0, sizeof(struct IrpInstance) ); + if (instance == NULL) + { + IoFreeIrp( irp ); + return NULL; + } + instance->irp = irp; + list_add_tail( &Irps, &instance->entry ); + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MajorFunction = majorfunc; + /*irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode;*/ + + irp->UserIosb = iosb; + irp->UserEvent = event; + irp->UserBuffer = buffer; + return irp; +} + + /*********************************************************************** * IoCreateDriver (NTOSKRNL.EXE.@) */ @@ -731,9 +768,21 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc { FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device ); - return STATUS_NOT_IMPLEMENTED; + *file = NULL; + *device = NULL; + + return STATUS_SUCCESS; } +/*********************************************************************** + * IoGetAttachedDevice (NTOSKRNL.EXE.@) + */ +PDEVICE_OBJECT WINAPI IoGetAttachedDevice( PDEVICE_OBJECT device ) +{ + FIXME( "stub: %p\n", device ); + + return device; +} /*********************************************************************** * IoGetDeviceProperty (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4ead907..3bcf21c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -322,7 +322,7 @@ @ stub IoBuildAsynchronousFsdRequest @ stdcall IoBuildDeviceIoControlRequest(long ptr ptr long ptr long long ptr ptr) @ stub IoBuildPartialMdl -@ stub IoBuildSynchronousFsdRequest +@ stdcall IoBuildSynchronousFsdRequest(long ptr ptr long ptr ptr ptr) @ stdcall IoCallDriver(ptr ptr) @ stub IoCancelFileOpen @ stub IoCancelIrp @@ -373,7 +373,7 @@ @ stdcall IoFreeIrp(ptr) @ stdcall IoFreeMdl(ptr) @ stub IoFreeWorkItem -@ stub IoGetAttachedDevice +@ stdcall IoGetAttachedDevice(ptr) @ stub IoGetAttachedDeviceReference @ stub IoGetBaseFileSystemDeviceObject @ stub IoGetBootDiskInformation

1 0

Sebastian Lackner : ws2_32: Improve implementation of get_poll_results.
by Alexandre Julliard Dec. 2, 2014

Dec. 2, 2014

Module: wine Branch: master Commit: d824b1ac3c874cb493d42eb7d0b8b998dc308897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d824b1ac3c874cb493d42eb7d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 29 11:18:18 2014 +0100 ws2_32: Improve implementation of get_poll_results. --- dlls/ws2_32/socket.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 142e964..ebafed5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4386,36 +4386,37 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set *exceptfds, const struct pollfd *fds ) { - unsigned int exceptfds_off = (readfds ? readfds->fd_count : 0) + (writefds ? writefds->fd_count : 0); - unsigned int i, j = 0, k, total = 0; + const struct pollfd *poll_writefds = fds + (readfds ? readfds->fd_count : 0); + const struct pollfd *poll_exceptfds = poll_writefds + (writefds ? writefds->fd_count : 0); + unsigned int i, k, total = 0; if (readfds) { - for (i = k = 0; i < readfds->fd_count; i++, j++) + for (i = k = 0; i < readfds->fd_count; i++) { - - if (fds[j].revents || - (readfds==writefds && (fds[readfds->fd_count+i].revents & POLLOUT) && - !(fds[readfds->fd_count+i].revents & POLLHUP)) || - (readfds==exceptfds && fds[exceptfds_off+i].revents)) + if (fds[i].revents || + (readfds == writefds && (poll_writefds[i].revents & POLLOUT) && !(poll_writefds[i].revents & POLLHUP)) || + (readfds == exceptfds && poll_exceptfds[i].revents)) readfds->fd_array[k++] = readfds->fd_array[i]; } readfds->fd_count = k; total += k; } - if (writefds && writefds!=readfds) + if (writefds && writefds != readfds) { - for (i = k = 0; i < writefds->fd_count; i++, j++) - if (((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP)) || - (writefds==exceptfds && fds[exceptfds_off+i].revents)) + for (i = k = 0; i < writefds->fd_count; i++) + { + if (((poll_writefds[i].revents & POLLOUT) && !(poll_writefds[i].revents & POLLHUP)) || + (writefds == exceptfds && poll_exceptfds[i].revents)) writefds->fd_array[k++] = writefds->fd_array[i]; + } writefds->fd_count = k; total += k; } - if (exceptfds && exceptfds!=readfds && exceptfds!=writefds) + if (exceptfds && exceptfds != readfds && exceptfds != writefds) { for (i = k = 0; i < exceptfds->fd_count; i++) - if (fds[exceptfds_off+i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i]; + if (poll_exceptfds[i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i]; exceptfds->fd_count = k; total += k; }

1 0