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

Isira Seneviratne : kernel32/nls: Fix some values in Sinhala NLS file.
by Alexandre Julliard 05 Mar '19

05 Mar '19

Module: wine Branch: master Commit: a6ca2001eb36bcad8e09edffce4d18aa73914208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6ca2001eb36bcad8e09edff… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Mon Mar 4 04:19:18 2019 +0530 kernel32/nls: Fix some values in Sinhala NLS file. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 8a96aa7..36dd281 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -43,11 +43,11 @@ STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "045B" - LOCALE_ILDATE "1" + LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" LOCALE_IMONLZERO "1" - LOCALE_INEGCURR "12" + LOCALE_INEGCURR "1" LOCALE_INEGNUMBER "1" LOCALE_INEGSEPBYSPACE "1" LOCALE_INEGSIGNPOSN "4"

1 0

Zebediah Figura : oleaut32: Unify the typelib and dispatch proxy/ stub factories.
by Alexandre Julliard 05 Mar '19

05 Mar '19

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

Zebediah Figura : vbscript: Handle carriage return in more places.
by Alexandre Julliard 05 Mar '19

05 Mar '19

Module: wine Branch: master Commit: 1bd7dbfbc42af85ad5309759d6311427f2860de9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd7dbfbc42af85ad5309759… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 4 17:14:55 2019 -0600 vbscript: Handle carriage return in more places. This fixes a regression introduced by 5800c9ed23a5c720843445d91c8547925493df8a. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46772 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 9 ++++++--- dlls/vbscript/tests/run.c | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index fa467f0..739f3ac 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -225,7 +225,7 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) int len = 0; while(ctx->ptr < ctx->end) { - if(*ctx->ptr == '\n') { + if(*ctx->ptr == '\n' || *ctx->ptr == '\r') { FIXME("newline inside string literal\n"); return 0; } @@ -497,11 +497,14 @@ int parser_lex(void *lval, parser_ctx_t *ctx) ret = parse_next_token(lval, ctx); if(ret == '_') { skip_spaces(ctx); - if(*ctx->ptr != '\n') { + if(*ctx->ptr != '\n' && *ctx->ptr != '\r') { FIXME("'_' not followed by newline\n"); return 0; } - ctx->ptr++; + if(*ctx->ptr == '\r') + ctx->ptr++; + if(*ctx->ptr == '\n') + ctx->ptr++; continue; } if(ret != tNL || ctx->last_token != tNL) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6be6c7f..88ec994 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2481,6 +2481,9 @@ static void run_tests(void) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); parse_script_a("' comment\r" + "x = _\r3\r" + "x = _\n3\r" + "x = _\r\n3\r" "Sub testsub(arg)\r" "If arg = 1 Then\r\r" "Call reportSuccess()\n\n"

1 0

Nikolay Sivov : mf: Add a stub for default presentation clock.
by Alexandre Julliard 05 Mar '19

05 Mar '19

Module: wine Branch: master Commit: 98a28d1493df33eef61a9865a86c508b962fd9f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a28d1493df33eef61a9865… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 5 10:49:38 2019 +0300 mf: Add a stub for default presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf.spec | 2 +- dlls/mf/session.c | 381 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 63 +++++++++ include/mferror.h | 2 + include/mfidl.idl | 58 +++++++- 5 files changed, 504 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98a28d1493df33eef61a…

1 0

Nikolay Sivov : mfplat: Implement MFCreatePresentationDescriptor().
by Alexandre Julliard 05 Mar '19

05 Mar '19

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 05 Mar '19

05 Mar '19

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 05 Mar '19

05 Mar '19

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

Nikolay Sivov : mfplat: Implement buffer collection for sample.
by Alexandre Julliard 05 Mar '19

05 Mar '19

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 05 Mar '19

05 Mar '19

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

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetAnnotation() helper.
by Alexandre Julliard 05 Mar '19

05 Mar '19

Module: wine Branch: master Commit: 7a1df2b0069bde1a9a022c6454fb8b3e06181fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1df2b0069bde1a9a022c64… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 23:15:58 2019 +0100 d3dx9: Merge the d3dx_effect_GetAnnotation() 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 | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dda460d..ea35631 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1286,25 +1286,6 @@ static UINT get_annotation_from_object(struct d3dx9_base_effect *base, } } -static D3DXHANDLE d3dx9_base_effect_get_annotation(struct d3dx9_base_effect *base, - D3DXHANDLE object, UINT index) -{ - struct d3dx_parameter *annotations = NULL; - UINT annotation_count = 0; - - annotation_count = get_annotation_from_object(base, object, &annotations); - - if (index < annotation_count) - { - TRACE("Returning parameter %p\n", &annotations[index]); - return get_parameter_handle(&annotations[index]); - } - - WARN("Annotation not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_effect *base, D3DXHANDLE object, const char *name) { @@ -3513,10 +3494,22 @@ static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *annotations = NULL; + unsigned int annotation_count; TRACE("iface %p, object %p, index %u.\n", iface, object, index); - return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index); + annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + + if (index < annotation_count) + { + TRACE("Returning parameter %p\n", &annotations[index]); + return get_parameter_handle(&annotations[index]); + } + + WARN("Annotation not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object,

1 0