March 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : oleaut32: Unify the typelib and dispatch proxy/ stub factories.
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: 968eda4b183ddde5401a2db5d52de7e6aceb5dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=968eda4b183ddde5401a2db5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 11:26:56 2019 -0600 oleaut32: Unify the typelib and dispatch proxy/stub factories. Both seem to be able to handle either kind of interface on Windows. f72f8e5c4 was not enough, since the IDispatch proxy/stub factory delegates to the typelib proxy/stub factory if the IID is not IDispatch. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 155 ++++++++++++++++++----------------------- dlls/oleaut32/tests/tmarshal.c | 35 +++++++++- 2 files changed, 102 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=968eda4b183ddde5401a…

1 0

Piotr Caban : kernel32/tests: Show that PAGE_WRITECOPY permission changes only on modified pages.
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: 2ee8554a0ae53597234c2b5fa6a95124d2dedeab URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ee8554a0ae53597234c2b5f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 18:41:16 2019 +0100 kernel32/tests: Show that PAGE_WRITECOPY permission changes only on modified pages. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 78bc17a..4749556 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3945,7 +3945,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) for (i = 0; i < ARRAY_SIZE(page_prot); i++) { SetLastError(0xdeadbeef); - hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | sec_flags, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | sec_flags, 0, 2*si.dwPageSize, NULL); if (readonly && (page_prot[i] == PAGE_READWRITE || page_prot[i] == PAGE_EXECUTE_READ || page_prot[i] == PAGE_EXECUTE_READWRITE || page_prot[i] == PAGE_EXECUTE_WRITECOPY)) @@ -4062,7 +4062,8 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); ok(info.BaseAddress == base, "%d: (%04x) got %p, expected %p\n", j, view[j].access, info.BaseAddress, base); - ok(info.RegionSize == si.dwPageSize, "%d: (%04x) got %#lx != expected %#x\n", j, view[j].access, info.RegionSize, si.dwPageSize); + ok(info.RegionSize == 2*si.dwPageSize || (info.RegionSize == si.dwPageSize && (sec_flags & SEC_IMAGE)), + "%d: (%04x) got %#lx != expected %#x\n", j, view[j].access, info.RegionSize, 2*si.dwPageSize); if (sec_flags & SEC_IMAGE) ok(info.Protect == PAGE_READONLY, "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); @@ -4177,7 +4178,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) if (!anon_mapping && is_compatible_protection(alloc_prot, PAGE_WRITECOPY)) { - ret = VirtualProtect(base, si.dwPageSize, PAGE_WRITECOPY, &old_prot); + ret = VirtualProtect(base, sec_flags & SEC_IMAGE ? si.dwPageSize : 2*si.dwPageSize, PAGE_WRITECOPY, &old_prot); todo_wine_if(readonly && view[j].prot != PAGE_WRITECOPY) ok(ret, "VirtualProtect error %d, map %#x, view %#x\n", GetLastError(), page_prot[i], view[j].prot); if (ret) *(DWORD*)base = 0xdeadbeef; @@ -4186,10 +4187,22 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) todo_wine ok(info.Protect == PAGE_READWRITE, "VirtualProtect wrong prot, map %#x, view %#x got %#x\n", page_prot[i], view[j].prot, info.Protect ); + todo_wine_if (!(sec_flags & SEC_IMAGE)) + ok(info.RegionSize == si.dwPageSize, "wrong region size %#lx after write, map %#x, view %#x got %#x\n", + info.RegionSize, page_prot[i], view[j].prot, info.Protect ); prev_prot = info.Protect; alloc_prot = info.AllocationProtect; + if (!(sec_flags & SEC_IMAGE)) + { + ret = VirtualQuery((char*)base + si.dwPageSize, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + todo_wine_if(readonly && view[j].prot != PAGE_WRITECOPY) + ok(info.Protect == PAGE_WRITECOPY, "wrong prot, map %#x, view %#x got %#x\n", + page_prot[i], view[j].prot, info.Protect); + } + for (k = 0; k < ARRAY_SIZE(page_prot); k++) { DWORD actual_prot = (sec_flags & SEC_IMAGE) ? map_prot_no_write(page_prot[k]) : page_prot[k]; @@ -4244,7 +4257,7 @@ static void test_mappings(void) hfile = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); - SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); + SetFilePointer(hfile, 2*si.dwPageSize, NULL, FILE_BEGIN); SetEndOfFile(hfile); test_mapping( hfile, SEC_COMMIT, FALSE );

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetPass() helper.
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: e419ac91ba5bd295b596f334951657b54dba3e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e419ac91ba5bd295b596f334… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:16:01 2019 +0100 d3dx9: Merge the d3dx_effect_GetPass() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c621b21..c9aeb87 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,22 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_technique_by_name(struct d3dx9_base_effe return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_pass(struct d3dx9_base_effect *base, - D3DXHANDLE technique, UINT index) -{ - struct d3dx_technique *tech = get_valid_technique(base, technique); - - if (tech && index < tech->pass_count) - { - TRACE("Returning pass %p\n", &tech->passes[index]); - return get_pass_handle(&tech->passes[index]); - } - - WARN("Pass not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *base, D3DXHANDLE technique, const char *name) { @@ -3436,10 +3420,19 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); - return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index); + if (tech && index < tech->pass_count) + { + TRACE("Returning pass %p\n", &tech->passes[index]); + return get_pass_handle(&tech->passes[index]); + } + + WARN("Pass not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name)

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetAnnotationByName() helper.
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: 1dd9104724b333fe27c2a1b7e57b31c29a252420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd9104724b333fe27c2a1b7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:15:59 2019 +0100 d3dx9: Merge the d3dx_effect_GetAnnotationByName() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea35631..e7b8b86 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1286,33 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } } -static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE object, const char *name) -{ - struct d3dx_parameter *annotation = NULL; - struct d3dx_parameter *annotations = NULL; - UINT annotation_count = 0; - - if (!name) - { - WARN("Invalid argument specified\n"); - return NULL; - } - - annotation_count = get_annotation_from_object(base, object, &annotations); - - annotation = get_annotation_by_name(base, annotation_count, annotations, name); - if (annotation) - { - TRACE("Returning parameter %p\n", annotation); - return get_parameter_handle(annotation); - } - - WARN("Annotation not found.\n"); - - return NULL; -} - static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep_func param_func, void *data) { @@ -3516,10 +3489,30 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *annotation = NULL; + struct d3dx_parameter *annotations = NULL; + unsigned int annotation_count; TRACE("iface %p, object %p, name %s.\n", iface, object, debugstr_a(name)); - return d3dx9_base_effect_get_annotation_by_name(&effect->base_effect, object, name); + if (!name) + { + WARN("Invalid argument specified\n"); + return NULL; + } + + annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + + annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); + if (annotation) + { + TRACE("Returning parameter %p\n", annotation); + return get_parameter_handle(annotation); + } + + WARN("Annotation not found.\n"); + + return NULL; } static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_annotation_from_object().
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: 89941842affb0fec7068a8bd7adca77d8c036032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89941842affb0fec7068a8bd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:16:00 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_annotation_from_object(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e7b8b86..c621b21 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1246,9 +1246,10 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; } -static UINT get_annotation_from_object(struct d3dx9_base_effect *base, - D3DXHANDLE object, struct d3dx_parameter **annotations) +static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, + struct d3dx_parameter **annotations) { + struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(base, object); struct d3dx_pass *pass = get_valid_pass(base, object); struct d3dx_technique *technique = get_valid_technique(base, object); @@ -3472,7 +3473,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDL TRACE("iface %p, object %p, index %u.\n", iface, object, index); - annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations); if (index < annotation_count) { @@ -3501,7 +3502,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D return NULL; } - annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations); annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); if (annotation)

1 0

Nikolay Sivov : mfplat: Implement buffer collection for sample.
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: 851113b06fcde958782eeb342631794299bed924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=851113b06fcde958782eeb34… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 5 10:49:42 2019 +0300 mfplat: Implement buffer collection for sample. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 127 +++++++++++++++++++++++++++++++++++++------ dlls/mfplat/main.c | 28 ---------- dlls/mfplat/mediatype.c | 1 - dlls/mfplat/mfplat_private.h | 29 ++++++++++ dlls/mfplat/queue.c | 1 - dlls/mfplat/tests/mfplat.c | 74 ++++++++++++++++++++++++- 6 files changed, 209 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=851113b06fcde958782e…

1 0

Vijay Kiran Kamuju : wmvcore: Add stub WMCreateBackupRestorer functions.
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: e06d90fa3feadd5bbcf6e69f1fb7e45abff5e202 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e06d90fa3feadd5bbcf6e69f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Mar 4 23:35:59 2019 +0100 wmvcore: Add stub WMCreateBackupRestorer functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37325 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore.spec | 4 ++-- dlls/wmvcore/wmvcore_main.c | 12 ++++++++++++ include/wmsdkidl.idl | 4 ++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index 66e5f20..65e0807 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,10 +1,10 @@ @ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) -@ stub WMCreateBackupRestorerPrivate +@ stdcall WMCreateBackupRestorerPrivate(ptr ptr) WMCreateBackupRestorer @ stub WMIsAvailableOffline @ stub WMValidateData @ stdcall -private DllRegisterServer() -@ stub WMCreateBackupRestorer +@ stdcall WMCreateBackupRestorer(ptr ptr) @ stdcall WMCreateEditor(ptr) @ stub WMCreateIndexer @ stdcall WMCreateProfileManager(ptr) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index d7eb1eb..10ed18a 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -74,6 +74,18 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } +HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **licBackup) +{ + FIXME("(%p %p): stub\n", callback, licBackup); + + if (!callback) + return E_INVALIDARG; + + *licBackup = NULL; + + return E_NOTIMPL; +} + typedef struct { IWMProfileManager IWMProfileManager_iface; LONG ref; diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 8798f22..4ee166a 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1893,6 +1893,10 @@ cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") cpp_quote("HRESULT WINAPI WMCreateSyncReader(IUnknown*,DWORD,IWMSyncReader**);") +cpp_quote("HRESULT WINAPI WMCreateEditor(IWMMetadataEditor**);") +cpp_quote("HRESULT WINAPI WMCreateBackupRestorer(IUnknown*,IWMLicenseBackup**);") +cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") + cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("EXTERN_GUID(WMMEDIATYPE_Video, 0x73646976,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Nikolay Sivov : mfplat: Implement MFCreatePresentationDescriptor().
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: 8de65329b8e585e8e66f5a6f9cce30ca395365af URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de65329b8e585e8e66f5a6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 5 10:49:39 2019 +0300 mfplat: Implement MFCreatePresentationDescriptor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 463 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 76 ++++++++ include/mfidl.idl | 2 + 4 files changed, 542 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8de65329b8e585e8e66f…

1 0

Nikolay Sivov : mfplat: Move buffer implementation to separate file.
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: 4fd32ad0543e312e52a49d6bff9ef311fe697432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd32ad0543e312e52a49d6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 5 10:49:40 2019 +0300 mfplat: Move buffer implementation to separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 1 + dlls/mfplat/buffer.c | 216 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/main.c | 174 ------------------------------------ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 52 ++++++++--- include/mfapi.h | 16 ++++ 6 files changed, 273 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fd32ad0543e312e52a4…

1 0

Nikolay Sivov : mfplat: Move sample implementation together with buffers.
by Alexandre Julliard March 5, 2019

March 5, 2019

Module: wine Branch: master Commit: 7343fc9e699ab72e0ad836ed71ce457c28d6467e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7343fc9e699ab72e0ad836ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 5 10:49:41 2019 +0300 mfplat: Move sample implementation together with buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 409 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/main.c | 444 --------------------------------------------------- 2 files changed, 409 insertions(+), 444 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7343fc9e699ab72e0ad8…

1 0