October 2018 - Wine-devel - list.winehq.org

[PATCH] version: Simplify null check in VerQueryValueW
by Alex Henrie 30 Oct '18

30 Oct '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/version/version.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 5299ecd32f..bd03b2be80 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1054,7 +1054,6 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, PUINT puLen ) { - static const WCHAR nullW[] = { 0 }; static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; @@ -1067,7 +1066,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, if (!pBlock) return FALSE; - if (lpSubBlock == NULL || lpSubBlock[0] == nullW[0]) + if (!lpSubBlock || !lpSubBlock[0]) lpSubBlock = rootW; if ( VersionInfoIs16( info ) ) -- 2.19.1

2 1

[PATCH] include: Correct include order
by Alistair Leslie-Hughes 30 Oct '18

30 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Makefile.in b/include/Makefile.in index 65d5d0e..e6d554b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -13,8 +13,8 @@ SOURCES = \ amaudio.h \ amstream.idl \ amvideo.idl \ - appcompatapi.h \ apiset.h \ + appcompatapi.h \ appmgmt.h \ appmodel.h \ asptlb.idl \ -- 1.9.1

2 1

[PATCH] testbot: Build the list of test units impacted by module patches.
by Francois Gouget 30 Oct '18

30 Oct '18

A patch to a dll or program is likely to impact its test units. This makes it possible to know which tests units to rerun. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 444ffaf491..fb4f88650f 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -216,6 +216,7 @@ sub _HandleFile($$$) my $Module = _CreateTestInfo($Impacts, $Root, $Dir); $Impacts->{PatchedModules} = 1; + $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -407,20 +408,23 @@ sub GetPatchImpacts($) $TestInfo->{Units} = {}; foreach my $File (keys %{$TestInfo->{Files}}) { - # Skip unmodified files - next if (!$TestInfo->{All} and !$TestInfo->{Files}->{$File}); - my $Base = $File; # Non-C files are not test units next if ($Base !~ s/(?:\.c|\.spec)$//); # Helper dlls are not test units next if (exists $TestInfo->{Files}->{"$Base.spec"}); + # Don't try running a deleted test unit obviously + next if ($TestInfo->{Files}->{$File} eq "rm"); - if (($TestInfo->{All} or $TestInfo->{Files}->{$File}) and - $TestInfo->{Files}->{$File} ne "rm") + if ($TestInfo->{All} or $TestInfo->{Files}->{$File}) { - # Only new/modified test units are impacted $TestInfo->{Units}->{$Base} = 1; + $Impacts->{ModuleUnitCount}++; + } + elsif ($TestInfo->{PatchedModule}) + { + # The module has been patched so this test unit is impacted indirectly. + $Impacts->{ModuleUnitCount}++; } } -- 2.19.1

1 0

[PATCH] testbot/WineRunWineTest: Remove support for the build Step type.
by Francois Gouget 30 Oct '18

30 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 75 ++++++++++++++++------------------ 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 5b6eb33e20..3784ef0657 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -383,7 +383,7 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } -if ($Step->Type ne "build" and $Step->Type ne "suite" and $Step->Type ne "single") +if ($Step->Type ne "suite" and $Step->Type ne "single") { FatalError("Unexpected step type '". $Step->Type ."' found\n"); } @@ -497,7 +497,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) } else { - $PossibleCrash = 1 if ($Step->Type ne "build"); + $PossibleCrash = 1; $TAError = "An error occurred while waiting for the task to complete: $ErrMessage"; $ErrMessage = undef; } @@ -549,49 +549,46 @@ elsif (!defined $TAError) # Grab the test reports if any # -if ($Step->Type ne "build") +foreach my $Build (keys %{$TaskMissions->{Builds}}) { - foreach my $Build (keys %{$TaskMissions->{Builds}}) + my $RptFileName = "$Build.report"; + Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); + if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { - my $RptFileName = "$Build.report"; - Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); - if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) - { - chmod 0664, "$TaskDir/$RptFileName"; + chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); - $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); - if (!defined $LogFailures and @$LogErrors == 1) - { - # Could not open the file - $NewStatus = 'boterror'; - Error "Unable to open '$RptFileName' for reading: $!\n"; - LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); - } - else - { - # $LogFailures can legitimately be undefined in case of a timeout - $TaskFailures += $LogFailures || 0; - if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) - { - # Save the extra errors detected by ParseWineTestReport() in - # $RptFileName.err: - # - This keep the .report file clean. - # - Each .err file can be matched to its corresponding .report, even - # if there are multiple .report files in the directory. - # - The .err file can be moved to the latest directory next to the - # reference report. - print $Log "$_\n" for (@$LogErrors); - close($Log); - } - } - } - elsif (!defined $TAError and - $TA->GetLastError() !~ /: No such file or directory/) + my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", 1, $TaskTimedOut); + $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); + if (!defined $LogFailures and @$LogErrors == 1) { - $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); + # Could not open the file $NewStatus = 'boterror'; + Error "Unable to open '$RptFileName' for reading: $!\n"; + LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); } + else + { + # $LogFailures can legitimately be undefined in case of a timeout + $TaskFailures += $LogFailures || 0; + if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) + { + # Save the extra errors detected by ParseWineTestReport() in + # $RptFileName.err: + # - This keep the .report file clean. + # - Each .err file can be matched to its corresponding .report, even + # if there are multiple .report files in the directory. + # - The .err file can be moved to the latest directory next to the + # reference report. + print $Log "$_\n" for (@$LogErrors); + close($Log); + } + } + } + elsif (!defined $TAError and + $TA->GetLastError() !~ /: No such file or directory/) + { + $TAError = "An error occurred while retrieving $RptFileName: ". $TA->GetLastError(); + $NewStatus = 'boterror'; } } -- 2.19.1

1 0

[PATCH] testbot/testagentd: Fix the SetTime() RPC on Unix.
by Francois Gouget 30 Oct '18

30 Oct '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/testagentd/platform_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 7a3a8f8e0a..560d1210ee 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -231,7 +231,7 @@ int platform_settime(uint64_t epoch, uint32_t leeway) tv.tv_sec = epoch; tv.tv_usec = 0; - if (!settimeofday(&tv, NULL)) + if (settimeofday(&tv, NULL)) { set_status(ST_ERROR, "failed to set the time: %s", strerror(errno)); return 0; -- 2.19.1

1 0

[PATCH 1/5] mfplat: Add MFCreateFile stub
by Sven Baars 30 Oct '18

30 Oct '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch series stops Disgaea 5 from crashing. This is the first time I send any functional patches, so feel free to correct me. dlls/mfplat/main.c | 30 +++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/Makefile.in | 2 + dlls/mfplat/tests/mfplat.c | 98 +++++++++++++++++++++++++++++++++- dlls/mfplat/tests/resource.rc | 24 +++++++++ dlls/mfplat/tests/test.mp4 | Bin 0 -> 1554 bytes include/mfapi.h | 2 + 7 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 dlls/mfplat/tests/resource.rc create mode 100644 dlls/mfplat/tests/test.mp4 diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bd6b99f1fa..e7e7e30b3d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -452,6 +452,8 @@ typedef struct _mfbytestream { IMFByteStream IMFByteStream_iface; LONG ref; + + IMFAttributes *attributes; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -470,6 +472,10 @@ static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID r { *out = &This->IMFByteStream_iface; } + else if(IsEqualGUID(riid, &IID_IMFAttributes) && This->attributes) + { + *out = This->attributes; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -500,6 +506,8 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + if (This->attributes) + IUnknown_Release((IUnknown*)This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -681,12 +689,34 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt object->ref = 1; object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + MFCreateAttributes(&object->attributes, 0); + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + +HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + LPCWSTR url, IMFByteStream **bytestream) +{ + mfbytestream *object; + + FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + MFCreateAttributes(&object->attributes, 0); *bytestream = &object->IMFByteStream_iface; return S_OK; } + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 3e42d2fd70..4533eeb71c 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -43,7 +43,7 @@ @ stub MFCreateAudioMediaType @ stub MFCreateCollection @ stdcall MFCreateEventQueue(ptr) -@ stub MFCreateFile +@ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index a5553a5af3..07cf328ad2 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -3,3 +3,5 @@ IMPORTS = ole32 mfplat C_SRCS = \ mfplat.c + +RC_SRCS = resource.rc diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17cdc46579..97fca67be6 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -49,6 +49,36 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; + +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(res != 0, "couldn't find resource\n"); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), + &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), + "couldn't write resource\n" ); + CloseHandle(file); + + return pathW; +} + static BOOL check_clsid(CLSID *clsids, UINT32 count) { int i; @@ -170,6 +200,9 @@ static void test_source_resolver(void) { IMFSourceResolver *resolver, *resolver2; HRESULT hr; + WCHAR *filename; + + static const WCHAR file_type[] = {'v','i','d','e','o','/','m','p','4',0}; if (!pMFCreateSourceResolver) { @@ -177,6 +210,12 @@ static void test_source_resolver(void) return; } + hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = pMFCreateSourceResolver(NULL); ok(hr == E_POINTER, "got %#x\n", hr); @@ -258,7 +297,9 @@ static void test_MFCreateAttributes(void) static void test_MFCreateMFByteStreamOnStream(void) { IMFByteStream *bytestream; + IMFByteStream *bytestream2; IStream *stream; + IMFAttributes *attributes; HRESULT hr; if(!pMFCreateMFByteStreamOnStream) @@ -270,13 +311,67 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK || + /* w7pro64 */ + broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr); + ok((void *)attributes != (void *)bytestream, "got %p\n", bytestream); + + if (hr == S_OK) + IMFAttributes_Release(attributes); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFByteStream, + (void **)&bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream == bytestream2, "got %p\n", bytestream2); IStream_Release(stream); IMFByteStream_Release(bytestream); } +static void test_MFCreateFile(void) +{ + IMFByteStream *bytestream; + IMFByteStream *bytestream2; + IMFAttributes *attributes; + HRESULT hr; + WCHAR *filename; + + filename = load_resource(mp4file); + + hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + (void **)&attributes); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((void *)attributes != (void *)bytestream, "got %p\n", bytestream); + + hr = IUnknown_QueryInterface(bytestream, &IID_IMFByteStream, + (void **)&bytestream2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bytestream == bytestream2, "got %p\n", bytestream2); + + IMFAttributes_Release(attributes); + IMFByteStream_Release(bytestream2); + IMFByteStream_Release(bytestream); + + MFShutdown(); + + DeleteFileW(filename); +} + static void test_MFCreateMemoryBuffer(void) { IMFMediaBuffer *buffer; @@ -390,6 +485,7 @@ START_TEST(mfplat) test_MFCreateMediaType(); test_MFCreateAttributes(); test_MFSample(); + test_MFCreateFile(); test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); diff --git a/dlls/mfplat/tests/resource.rc b/dlls/mfplat/tests/resource.rc new file mode 100644 index 0000000000..e9bf920c31 --- /dev/null +++ b/dlls/mfplat/tests/resource.rc @@ -0,0 +1,24 @@ +/* + * Resources for mfplat test suite. + * + * Copyright 2018 Sven Baars + * + * 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 "windef.h" + +/* @makedep: test.mp4 */ +test.mp4 RCDATA test.mp4 diff --git a/dlls/mfplat/tests/test.mp4 b/dlls/mfplat/tests/test.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..a5bbca6bbf7692eab047050b79b8ccc83516e6b4 GIT binary patch literal 1554 zcmZuxeN0nV6u<3bttg}g3M<<3v4A5C7=;cYskS&=aH+Gw(TQ=|2k#+BpKbac6$q26 zgvfMZE^O--6L1NclR1flh8QLw4%rM5#eGC{R2Jv(j|s9(8MANazOwnmo#gk<x#yhw zyZ4(a)R-$e*%%DGx+CF@`ik|L}DS&UP!LkKM^chNNX_cIj9Atd<{DdnJiN*lZEK&*TH zLUnilE|&Pi#`t<(V2JeCh0xUFbE~$JpP!3QD)e^to(a)B05Kdu~jt~KuYz}1=h$wy;^ z-(P&iYuL#r*6qMlmYD;w&8gboiuVmim)E`@VY(w}d_`I2ihOP3>WzsJPV$oN<)LWX zeE-6+iWMz`xA<B45szMa^nqwQ5w>wzrc-v;{3ns3&Hgygab(a)co_v%sWh^~kxZdgv1 zG$e27=y&X0FwfM)&vJ1wQfF>hX5`>p!|hca@<xwAt#6-gnD>;lG>BPmWrt3nUp`73 z+Yr|+TbnzS=UsV1v;C6gviW|rw)-!S-=bHn;0v1+QGDC}Ia|1D&?ob%jF`h$Wc#Ew zV;vf3`obS*$vM<kEDwCQ`|#nw>4L6xr#4wnKY06wGT*}wdIn7LW=}zVn#?n%4mVMz zS*QG<-xMcs%$)a1n<6jX{=IjfF~joa!xMeyYRwY|Cr0Vm>*3w%uu#*`=0;_WapAn$ zU<`El(a)AbuA79AjpWMkq|c1;#tZJ#~+J(2cx>Nm%BvdmP*5AP|wGW~$TESZLVhn6a1 ztO^C+GL%><v}DW7eXsQJ-HUG|I!ZcwqEv0#Ya(a)m<t5KG7N5rlo$2IYtr*eGsbj8h0 z?c(a)jJ8?GH6PW~!_$shUIcJraKf^47ff8>qKKRQs;^7r5rKP{`hCoZsRD*LTIOV>}^ zv}Z#0Dsy%(f4!(s5zT+wRX-W1@{bU&DxT$gcYNB95Wz4GhZ`=WopD!CphZIb3Y&Tt zN#HB;J~@EE6G4Pb;@qcgDO~ywITu+4q3v9iuqGi&TV#WEm&%fL{&(FFn1q2)5>0U| zXbo*=;Rh207#4X2E~$c{DoKbWFx1ksXMtOViZ2NB(km#tOR(VMuB70{eJoZOI||7? zl%2*olCw<Zo^mi$Zbl##Z##(!#x#_R#yMDUJgnMfPYBwQI+iQ7gFVc0?7t1cIX-wf zaHFt(a)IfI@MICdeJ7+9Xp2>Ks?)jSUa8_iO<Oo;G!Jey%!2<ZHT2<$>SD4dRa20SkU zV;68rdYYqx<dOt*;hjTh6eXe7GH{(SlkT#Yax=1Y8M;ip4CY9n)kw{9LK`q0-qUjY z7J{U}>4bH`mH}`KUjy7ccnDD_0CJHA(a)_=3toU_OwXamIR7Gqf9{35_wfE7@%h&<3n zKs;bQARC}!xiSZ6ESNJ5P+CoKB<O7nEod-NqPX>NU0kHoiM#Wkq*n&-SMq0^0~2cD TJ;x-N6hTeOp(eUDP!ruh^$B~# literal 0 HcmV?d00001 diff --git a/include/mfapi.h b/include/mfapi.h index bc832bf95f..0230a08471 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -67,6 +67,8 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); +HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, + LPCWSTR url, IMFByteStream **bytestream); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); -- 2.17.1

4 7

[PATCH resend] winex11.drv: handle missing thread data in X11DRV_get_ic
by Enrico Horn 29 Oct '18

29 Oct '18

From: Enrico Horn <farmboy0+winehq(a)googlemail.com> Hi, This patch fixes a crash in winex11.drv when loading IME. This happens in Final Fantasy XI when using Ashita or Windower 3rd party applications. There has been no bug reported I just fixed the bug for myself. Here is the crash record: Unhandled exception: page fault on write access to 0x00000014 in 32-bit code (0x7d85a94b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7d85a94b ESP:0836fd10 EBP:0836fd38 EFLAGS:00010212( R- -- I -A- - ) EAX:00000000 EBX:0015abe8 ECX:00010050 EDX:00000000 ESI:00000000 EDI:7d894000 Stack dump: 0x0836fd10: 001e60c8 00000158 0836fdb8 00010050 0x0836fd20: 00000000 7d894000 7d85a90b 7d894000 0x0836fd30: 001e60cc 001e60c8 0836fd58 7d86560b 0x0836fd40: 00010050 00000035 7d827a09 7d8655fa 0x0836fd50: 7d894000 001e60cc 0836fd98 7d83c0ef 0x0836fd60: 00010050 7d894000 0836fd98 7d83bfb0 Backtrace: =>0 0x7d85a94b X11DRV_get_ic+0x4b(hwnd=0x10050) [/mnt/work/Repositories/wine/dlls/winex11.drv/window.c:2040] in winex11 (0x0836fd38) 1 0x7d86560b X11DRV_ForceXIMReset+0x1a(hwnd=0x10050) [/mnt/work/Repositories/wine/dlls/winex11.drv/xim.c:255] in winex11 (0x0836fd58) 2 0x7d83c0ef NotifyIME+0x17e(hIMC=<couldn't compute location>, dwAction=<couldn't compute location>, dwIndex=<couldn't compute location>, dwValue=<couldn't compute location>) [/mnt/work/Repositories/wine/dlls/winex11.drv/ime.c:764] in winex11 (0x0836fd98) 3 0x7dc80793 ImmNotifyIME+0x62(hIMC=<couldn't compute location>, dwAction=<couldn't compute location>, dwIndex=<couldn't compute location>, dwValue=<couldn't compute location>) [/mnt/work/Repositories/wine/dlls/imm32/imm.c:2189] in imm32 (0x0836fde8) 0x7d85a94b X11DRV_get_ic+0x4b [/mnt/work/Repositories/wine/dlls/winex11.drv/window.c:2040] in winex11: movl %ecx,0x14(%eax) 2040 x11drv_thread_data()->last_xic_hwnd = hwnd; Signed-off-by: Enrico Horn <farmboy0+winehq(a)googlemail.com> --- dlls/winex11.drv/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340e19a..7dce6816ad7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2034,6 +2034,11 @@ XIC X11DRV_get_ic( HWND hwnd ) XIM xim; XIC ret = 0; + if (!x11drv_thread_data()) + { + release_win_data( data ); + return NULL; + } if (data) { x11drv_thread_data()->last_xic_hwnd = hwnd; -- 2.19.1

1 0

[PATCH] setupapi: Fix broken control definition
by Alistair Leslie-Hughes 29 Oct '18

29 Oct '18

Based on patch by Mark Jansen from reactos. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/setupapi/setupapi.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index c03f01f..f5da61f 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -43,7 +43,7 @@ BEGIN LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Destination:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", PROGRESSORD, "setupx_progress", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 63, 194, 13 END IDPROMPTFORDISK DIALOG 0, 0, 260, 120 -- 1.9.1

1 0

[PATCH] winecfg: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 29 Oct '18

29 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/driveui.c | 2 +- programs/winecfg/theme.c | 12 +++++------- programs/winecfg/winecfg.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index c25e71df52..36ae88c832 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -440,7 +440,7 @@ static void update_controls(HWND dialog) type = current_drive->type; SendDlgItemMessageW(dialog, IDC_COMBO_TYPE, CB_RESETCONTENT, 0, 0); - for (i = 0; i < sizeof(type_pairs) / sizeof(struct drive_typemap); i++) + for (i = 0; i < ARRAY_SIZE(type_pairs); i++) { WCHAR driveDesc[64]; LoadStringW(GetModuleHandleW(NULL), type_pairs[i].idDesc, driveDesc, ARRAY_SIZE(driveDesc)); diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 5304f7240c..78d89a5ea8 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -635,7 +635,7 @@ static void on_theme_install(HWND dialog) ofn.nFilterIndex = 0; ofn.lpstrFile = file; ofn.lpstrFile[0] = '\0'; - ofn.nMaxFile = sizeof(file)/sizeof(filetitle[0]); + ofn.nMaxFile = ARRAY_SIZE(file); ofn.lpstrFileTitle = filetitle; ofn.lpstrFileTitle[0] = '\0'; ofn.nMaxFileTitle = ARRAY_SIZE(filetitle); @@ -729,8 +729,6 @@ static struct ShellFolderInfo asfiInfo[] = { static struct ShellFolderInfo *psfiSelected = NULL; -#define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x))) - static void init_shell_folder_listview_headers(HWND dialog) { LVCOLUMNW listColumn; RECT viewRect; @@ -763,8 +761,8 @@ static void read_shell_folder_link_targets(void) { WCHAR wszPath[MAX_PATH]; HRESULT hr; int i; - - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { asfiInfo[i].szLinkTarget[0] = '\0'; hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL, SHGFP_TYPE_CURRENT, wszPath); @@ -790,7 +788,7 @@ static void update_shell_folder_listview(HWND dialog) { SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_DELETEALLITEMS, 0, 0); - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { WCHAR buffer[MAX_PATH]; HRESULT hr; LPITEMIDLIST pidlCurrent; @@ -905,7 +903,7 @@ static void apply_shell_folder_changes(void) { struct stat statPath; HRESULT hr; - for (i=0; i<NUM_ELEMS(asfiInfo); i++) { + for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { /* Ignore nonexistent link targets */ if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath)) continue; diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index be04ba2a77..c4c05bd186 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -623,7 +623,7 @@ static void process_setting(struct setting *s) static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; HKEY key; BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && - !strncmpiW( s->path, softwareW, sizeof(softwareW)/sizeof(WCHAR) )); + !strncmpiW(s->path, softwareW, ARRAY_SIZE(softwareW))); if (s->value) { -- 2.14.5

1 0

[PATCH] cmd: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 29 Oct '18

29 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/wcmdmain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5ef4a2bf34..1c99661b44 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2419,9 +2419,9 @@ int wmain (int argc, WCHAR *argvW[]) OSVERSIONINFOW osv; char osver[50]; - if (!GetEnvironmentVariableW(comspecW, comspec, sizeof(comspec)/sizeof(WCHAR))) + if (!GetEnvironmentVariableW(comspecW, comspec, ARRAY_SIZE(comspec))) { - GetSystemDirectoryW(comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR)); + GetSystemDirectoryW(comspec, ARRAY_SIZE(comspec) - ARRAY_SIZE(cmdW)); strcatW(comspec, cmdW); SetEnvironmentVariableW(comspecW, comspec); } -- 2.14.5

1 0