October 2017 - Wine-Commits

Jacek Caban : shlwapi: Support NT prefix paths in PathGetDriveNumberW.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: 62c4ffb4d6b85280ac8406c1af73c1db07fe3130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c4ffb4d6b85280ac8406c1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 23:57:53 2017 +0200 shlwapi: Support NT prefix paths in PathGetDriveNumberW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 26 +++++++++++++++++--------- dlls/shlwapi/tests/path.c | 12 ++++++++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 3c07bb8..89a3572 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -538,17 +538,25 @@ int WINAPI PathGetDriveNumberA(LPCSTR lpszPath) * * See PathGetDriveNumberA. */ -int WINAPI PathGetDriveNumberW(LPCWSTR lpszPath) +int WINAPI PathGetDriveNumberW(const WCHAR *path) { - TRACE ("(%s)\n",debugstr_w(lpszPath)); + WCHAR drive; - if (lpszPath) - { - WCHAR tl = tolowerW(lpszPath[0]); - if (tl >= 'a' && tl <= 'z' && lpszPath[1] == ':') - return tl - 'a'; - } - return -1; + static const WCHAR nt_prefixW[] = {'\\','\\','?','\\'}; + + TRACE("(%s)\n", debugstr_w(path)); + + if (!path) + return -1; + + if (!strncmpW(path, nt_prefixW, 4)) + path += 4; + + drive = tolowerW(path[0]); + if (drive < 'a' || drive > 'z' || path[1] != ':') + return -1; + + return drive - 'a'; } /************************************************************************* diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index f780a78..57fdfdd 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1429,6 +1429,11 @@ static void test_PathGetDriveNumber(void) static const CHAR test2A[] = "file:////b:\\test.file"; static const CHAR test3A[] = "file:///c:\\test.file"; static const CHAR test4A[] = "file:\\\\c:\\test.file"; + static const CHAR test5A[] = "\\\\?\\C:\\dir\\file.txt"; + static const WCHAR test1W[] = + {'a',':','\\',0}; + static const WCHAR test5W[] = + {'\\','\\','?','\\','C',':','\\','d','i','r','\\','f','i','l','e',0}; int ret; SetLastError(0xdeadbeef); @@ -1438,12 +1443,19 @@ static void test_PathGetDriveNumber(void) ret = PathGetDriveNumberA(test1A); ok(ret == 0, "got %d\n", ret); + ret = PathGetDriveNumberW(test1W); + ok(ret == 0, "got %d\n", ret); ret = PathGetDriveNumberA(test2A); ok(ret == -1, "got %d\n", ret); ret = PathGetDriveNumberA(test3A); ok(ret == -1, "got %d\n", ret); ret = PathGetDriveNumberA(test4A); ok(ret == -1, "got %d\n", ret); + + ret = PathGetDriveNumberA(test5A); + ok(ret == -1, "got %d\n", ret); + ret = PathGetDriveNumberW(test5W); + ok(ret == 2 || broken(ret == -1) /* winxp */, "got = %d\n", ret); } static void test_PathUnExpandEnvStrings(void)

1 0

Stefan Dösinger : msvcp140: Export _Remove_dir.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: d4f1175a9372aedc284542112dc78bad3a8cd2fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f1175a9372aedc284542112… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 17:09:42 2017 +0200 msvcp140: Export _Remove_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1aeb939b..80840db 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3693,7 +3693,7 @@ @ cdecl -ret64 _Query_perf_counter() @ cdecl -ret64 _Query_perf_frequency() @ cdecl _Read_dir(ptr ptr ptr) tr2_sys__Read_dir_wchar -@ stub _Remove_dir +@ cdecl _Remove_dir(wstr) tr2_sys__Remove_dir_wchar @ stub _Rename @ stub _Resize @ stub _Set_last_write_time

1 0

Piotr Caban : vbscript/tests: Expose todo_wine_ok function to scripts.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: c4d72438334b83177d75681edf6931958b702a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d72438334b83177d75681ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 17:08:05 2017 +0200 vbscript/tests: Expose todo_wine_ok function to scripts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/error.vbs | 12 ++++++------ dlls/vbscript/tests/run.c | 10 +++++++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index 3bf03df..78314c3 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -190,7 +190,7 @@ sub testThrow next call ok(x = 2, "x = " & x) call ok(y = 1, "y = " & y) - 'todo_wine call ok(Err.Number = VB_E_OBJNOTCOLLECTION, "Err.Number = " & Err.Number) + call todo_wine_ok(Err.Number = VB_E_OBJNOTCOLLECTION, "Err.Number = " & Err.Number) Err.clear() y = 0 @@ -202,19 +202,19 @@ sub testThrow next call ok(y = 1, "y = " & y) call ok(x = 6, "x = " & x) - 'todo_wine call ok(Err.Number = VB_E_FORLOOPNOTINITIALIZED, "Err.Number = " & Err.Number) + call todo_wine_ok(Err.Number = VB_E_FORLOOPNOTINITIALIZED, "Err.Number = " & Err.Number) Err.clear() y = 0 x = 6 for x = 100 to throwInt(E_TESTERROR) call ok(Err.Number = E_TESTERROR, "Err.Number = " & Err.Number) - 'todo_wine call ok(x = 6, "x = " & x) + call todo_wine_ok(x = 6, "x = " & x) y = y+1 next call ok(y = 1, "y = " & y) - 'todo_wine call ok(x = 6, "x = " & x) - 'todo_wine call ok(Err.Number = VB_E_FORLOOPNOTINITIALIZED, "Err.Number = " & Err.Number) + call todo_wine_ok(x = 6, "x = " & x) + call todo_wine_ok(Err.Number = VB_E_FORLOOPNOTINITIALIZED, "Err.Number = " & Err.Number) select case throwInt(E_TESTERROR) case true @@ -308,7 +308,7 @@ sub testForEachError() y = true next call ok(y, "for each not executed") - 'todo_wine call ok(Err.Number = VB_E_OBJNOTCOLLECTION, "Err.Number = " & Err.Number) + call todo_wine_ok(Err.Number = VB_E_OBJNOTCOLLECTION, "Err.Number = " & Err.Number) end sub call testForEachError() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 798992f..81b1ced 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -122,6 +122,7 @@ DEFINE_EXPECT(OnScriptError); #define DISPID_GLOBAL_TESTOPTIONALARG 1017 #define DISPID_GLOBAL_LETOBJ 1018 #define DISPID_GLOBAL_SETOBJ 1019 +#define DISPID_GLOBAL_TODO_WINE_OK 1020 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -983,6 +984,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_OK; return S_OK; } + if(!strcmp_wa(bstrName, "todo_wine_ok")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TODO_WINE_OK; + return S_OK; + } if(!strcmp_wa(bstrName, "trace")) { test_grfdex(grfdex, fdexNameCaseInsensitive); *pid = DISPID_GLOBAL_TRACE; @@ -1092,6 +1098,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { + case DISPID_GLOBAL_TODO_WINE_OK: case DISPID_GLOBAL_OK: { VARIANT *b; @@ -1115,7 +1122,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(b) == VT_BOOL, "V_VT(b) = %d\n", V_VT(b)); - ok(V_BOOL(b), "%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + todo_wine_if(id == DISPID_GLOBAL_TODO_WINE_OK) + ok(V_BOOL(b), "%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); return S_OK; }

1 0

Alistair Leslie-Hughes : qedit: Support IAMTimelineGroup interface in IAMTimelineObj.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: cfcc0dda15eb04c87319e2a0cd61212cdf8dcce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfcc0dda15eb04c87319e2a0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 5 05:15:45 2017 +0000 qedit: Support IAMTimelineGroup interface in IAMTimelineObj. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/timeline.c | 12 ++- dlls/qedit/timeline.c | 195 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index 4801743..b1011fc 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -124,11 +124,17 @@ static void test_timelineobj_interfaces(void) if(hr == S_OK) { IAMTimelineGroup *group; + IAMTimelineObj *obj2; hr = IAMTimelineObj_QueryInterface(obj, &IID_IAMTimelineGroup, (void **)&group); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - if(hr == S_OK) - IAMTimelineGroup_Release(group); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IAMTimelineGroup_QueryInterface(group, &IID_IAMTimelineObj, (void **)&obj2); + ok(hr == S_OK, "got %08x\n", hr); + ok(obj == obj2, "Different pointers\n"); + IAMTimelineObj_Release(obj2); + + IAMTimelineGroup_Release(group); IAMTimelineObj_Release(obj); } diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 906efd5..5d3fb46 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -51,6 +51,7 @@ static inline TimelineImpl *impl_from_IAMTimeline(IAMTimeline *iface) typedef struct { IAMTimelineObj IAMTimelineObj_iface; + IAMTimelineGroup IAMTimelineGroup_iface; LONG ref; TIMELINE_MAJOR_TYPE timeline_type; } TimelineObjImpl; @@ -60,7 +61,13 @@ static inline TimelineObjImpl *impl_from_IAMTimelineObj(IAMTimelineObj *iface) return CONTAINING_RECORD(iface, TimelineObjImpl, IAMTimelineObj_iface); } +static inline TimelineObjImpl *impl_from_IAMTimelineGroup(IAMTimelineGroup *iface) +{ + return CONTAINING_RECORD(iface, TimelineObjImpl, IAMTimelineGroup_iface); +} + static const IAMTimelineObjVtbl IAMTimelineObj_VTable; +static const IAMTimelineGroupVtbl IAMTimelineGroup_VTable; /* Timeline inner IUnknown */ @@ -170,6 +177,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_CreateEmptyNode(IAMTimeline *iface, I obj_impl->ref = 1; obj_impl->IAMTimelineObj_iface.lpVtbl = &IAMTimelineObj_VTable; + obj_impl->IAMTimelineGroup_iface.lpVtbl = &IAMTimelineGroup_VTable; obj_impl->timeline_type = type; *obj = &obj_impl->IAMTimelineObj_iface; @@ -453,6 +461,8 @@ static HRESULT WINAPI TimelineObj_QueryInterface(IAMTimelineObj *iface, REFIID r *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAMTimelineObj)) *ppv = &This->IAMTimelineObj_iface; + else if (IsEqualIID(riid, &IID_IAMTimelineGroup)) + *ppv = &This->IAMTimelineGroup_iface; else WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); @@ -803,3 +813,188 @@ static const IAMTimelineObjVtbl IAMTimelineObj_VTable = TimelineObj_GetGroupIBelongTo, TimelineObj_GetEmbedDepth, }; + +static HRESULT WINAPI timelinegrp_QueryInterface(IAMTimelineGroup *iface, REFIID riid, void **object) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + return IAMTimelineObj_QueryInterface(&This->IAMTimelineObj_iface, riid, object); +} + +static ULONG WINAPI timelinegrp_AddRef(IAMTimelineGroup *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + return IAMTimelineObj_AddRef(&This->IAMTimelineObj_iface); +} + +static ULONG WINAPI timelinegrp_Release(IAMTimelineGroup *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + return IAMTimelineObj_Release(&This->IAMTimelineObj_iface); +} + +static HRESULT WINAPI timelinegrp_SetTimeline(IAMTimelineGroup *iface, IAMTimeline *timeline) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, timeline); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetTimeline(IAMTimelineGroup *iface, IAMTimeline **timeline) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, timeline); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetPriority(IAMTimelineGroup *iface, LONG *priority) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, priority); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetMediaType(IAMTimelineGroup *iface, AM_MEDIA_TYPE *mediatype) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, mediatype); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetMediaType(IAMTimelineGroup *iface, AM_MEDIA_TYPE *mediatype) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, mediatype); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetOutputFPS(IAMTimelineGroup *iface, double fps) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%f)\n", This, fps); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetOutputFPS(IAMTimelineGroup *iface, double *fps) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, fps); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetGroupName(IAMTimelineGroup *iface, BSTR name) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetGroupName(IAMTimelineGroup *iface, BSTR *name) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetPreviewMode(IAMTimelineGroup *iface, BOOL preview) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%d)\n", This, preview); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetPreviewMode(IAMTimelineGroup *iface, BOOL *preview) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, preview); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetMediaTypeForVB(IAMTimelineGroup *iface, LONG type) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%d)\n", This, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetOutputBuffering(IAMTimelineGroup *iface, int *buffer) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetOutputBuffering(IAMTimelineGroup *iface, int buffer) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%d)\n", This, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetSmartRecompressFormat(IAMTimelineGroup *iface, LONG *format) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_GetSmartRecompressFormat(IAMTimelineGroup *iface, LONG **format) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_IsSmartRecompressFormatSet(IAMTimelineGroup *iface, BOOL *set) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, set); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_IsRecompressFormatDirty(IAMTimelineGroup *iface, BOOL *dirty) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, dirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_ClearRecompressFormatDirty(IAMTimelineGroup *iface) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI timelinegrp_SetRecompFormatFromSource(IAMTimelineGroup *iface, IAMTimelineSrc *source) +{ + TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); + FIXME("(%p)->(%p)\n", This, source); + return E_NOTIMPL; +} + +static const IAMTimelineGroupVtbl IAMTimelineGroup_VTable = +{ + timelinegrp_QueryInterface, + timelinegrp_AddRef, + timelinegrp_Release, + timelinegrp_SetTimeline, + timelinegrp_GetTimeline, + timelinegrp_GetPriority, + timelinegrp_GetMediaType, + timelinegrp_SetMediaType, + timelinegrp_SetOutputFPS, + timelinegrp_GetOutputFPS, + timelinegrp_SetGroupName, + timelinegrp_GetGroupName, + timelinegrp_SetPreviewMode, + timelinegrp_GetPreviewMode, + timelinegrp_SetMediaTypeForVB, + timelinegrp_GetOutputBuffering, + timelinegrp_SetOutputBuffering, + timelinegrp_SetSmartRecompressFormat, + timelinegrp_GetSmartRecompressFormat, + timelinegrp_IsSmartRecompressFormatSet, + timelinegrp_IsRecompressFormatDirty, + timelinegrp_ClearRecompressFormatDirty, + timelinegrp_SetRecompFormatFromSource +};

1 0

Alexandre Julliard : opengl32: Get type definitions from the XML files.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: bbb71620cd32cfde52337f5f62eea5a362ca8b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb71620cd32cfde52337f5f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 9 15:21:31 2017 +0200 opengl32: Get type definitions from the XML files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 234 ++++++++++++++++--------------------------- dlls/opengl32/opengl_ext.c | 14 +-- dlls/opengl32/opengl_norm.c | 14 +-- dlls/opengl32/tests/opengl.c | 1 - dlls/opengl32/winegl.xml | 18 ++++ include/wine/wgl.h | 90 +++++++++++------ include/wine/wgl_driver.h | 14 +-- include/wine/wglext.h | 28 ------ 8 files changed, 186 insertions(+), 227 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb71620cd32cfde52337…

1 0

Alexandre Julliard : opengl32: Get WGL function definitions from the XML files.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: 17dffaac7d5a8fc595775d456bb85e343d5aa195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17dffaac7d5a8fc595775d456… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 10 10:06:10 2017 +0200 opengl32: Get WGL function definitions from the XML files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 4 +- dlls/opengl32/make_opengl | 147 ++++++++++++++++++++++++------------------ dlls/opengl32/opengl32.spec | 5 +- dlls/opengl32/opengl_norm.c | 18 +++--- dlls/opengl32/winegl.xml | 14 ++++ dlls/wineandroid.drv/opengl.c | 4 +- dlls/winemac.drv/opengl.c | 4 +- dlls/winex11.drv/opengl.c | 4 +- include/wine/wgl_driver.h | 10 +-- 9 files changed, 122 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17dffaac7d5a8fc595775…

1 0

Stefan Dösinger : msvcp: Implement the WCHAR version of _Unlink.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: eea0f37a1a8cda59ebcec698356af0cc46f2107b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea0f37a1a8cda59ebcec6983… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 10 17:09:43 2017 +0200 msvcp: Implement the WCHAR version of _Unlink. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 12 ++++++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b3f2223..4d46be4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1768,8 +1768,8 @@ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy @ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink @ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) tr2_sys__Unlink_wchar +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) tr2_sys__Unlink_wchar @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ(ptr) basic_streambuf_char__Unlock @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ(ptr) basic_streambuf_char__Unlock diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 4d4c88e..fd99058 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1768,8 +1768,8 @@ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) msvcp120.?_Tidy(a)ios_base@std@@AEAAXXZ @ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z @ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 80840db..74ff305 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3737,7 +3737,7 @@ @ cdecl _Toupper(long ptr) _Toupper @ cdecl _Towlower(long ptr) _Towlower @ cdecl _Towupper(long ptr) _Towupper -@ stub _Unlink +@ cdecl _Unlink(wstr) tr2_sys__Unlink_wchar @ cdecl _Unlock_shared_ptr_spin_lock() @ stub _WStod @ stub _WStodx diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 28deae0..36e5067 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15060,6 +15060,18 @@ int __cdecl tr2_sys__Unlink(char const* path) return GetLastError(); } +/* ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z */ +/* ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z */ +/* _Unlink */ +int __cdecl tr2_sys__Unlink_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + + if(DeleteFileW(path)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Piotr Caban : vbscript: Add Array implementation.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: 0a15f2e02f5b61ad380f592ef6452148c118f2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a15f2e02f5b61ad380f592ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 17:07:50 2017 +0200 vbscript: Add Array implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 42 +++++++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7e14776..f523820 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1792,8 +1792,44 @@ static HRESULT Global_TypeName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_Array(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SAFEARRAYBOUND bounds; + SAFEARRAY *sa; + VARIANT *data; + HRESULT hres; + unsigned i; + + TRACE("arg_cnt=%u\n", args_cnt); + + bounds.lLbound = 0; + bounds.cElements = args_cnt; + sa = SafeArrayCreate(VT_VARIANT, 1, &bounds); + if(!sa) + return E_OUTOFMEMORY; + + hres = SafeArrayAccessData(sa, (void**)&data); + if(FAILED(hres)) { + SafeArrayDestroy(sa); + return hres; + } + + for(i=0; i<args_cnt; i++) { + hres = VariantCopyInd(data+i, arg+i); + if(FAILED(hres)) { + SafeArrayUnaccessData(sa); + SafeArrayDestroy(sa); + return hres; + } + } + SafeArrayUnaccessData(sa); + + if(res) { + V_VT(res) = VT_ARRAY|VT_VARIANT; + V_ARRAY(res) = sa; + }else { + SafeArrayDestroy(sa); + } + + return S_OK; } static HRESULT Global_Erase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -2272,7 +2308,7 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_DATEDIFF, Global_DateDiff, 0, 3, 5}, {DISPID_GLOBAL_DATEPART, Global_DatePart, 0, 2, 4}, {DISPID_GLOBAL_TYPENAME, Global_TypeName, 0, 1}, - {DISPID_GLOBAL_ARRAY, Global_Array, 0, 1}, + {DISPID_GLOBAL_ARRAY, Global_Array, 0, 0, MAXDWORD}, {DISPID_GLOBAL_ERASE, Global_Erase, 0, 1}, {DISPID_GLOBAL_FILTER, Global_Filter, 0, 2, 4}, {DISPID_GLOBAL_JOIN, Global_Join, 0, 1, 2}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index f6b6f69..95ef84f 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -212,6 +212,21 @@ arr(0) = 2 arr(1) = 3 Call ok(not isNumeric(arr), "isNumeric(arr) is not true?") +Call ok(getVT(Array()) = "VT_ARRAY|VT_VARIANT", "getVT(Array()) = " & getVT(Array())) +x = Array("a1", 2, "a3") +Call ok(getVT(x) = "VT_ARRAY|VT_VARIANT*", "getVT(array) = " & getVT(x)) +Call ok(getVT(x(0)) = "VT_BSTR*", "getVT(array(0)) = " & getVT(x(0))) +Call ok(x(0) = "a1", "array(0) = " & x(0)) +Call ok(getVT(x(1)) = "VT_I2*", "getVT(array(1)) = " & getVT(x(1))) +Call ok(x(1) = 2, "array(1) = " & x(1)) +Call ok(getVT(x(2)) = "VT_BSTR*", "getVT(array(2)) = " & getVT(x(2))) +Call ok(x(2) = "a3", "array(2) = " & x(2)) + +Dim new_array +new_array = x +x(0) = "new value" +Call ok(new_array(0) = "a1", "new_array(0) = " & new_array(0)) + Dim newObject Set newObject = New ValClass newObject.myval = 1

1 0

Fabian Maurer : ole32: Don't redefine htole32/htole16.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: 0736e4e302aded8791ce1e9a6c0fc805bcd55aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0736e4e302aded8791ce1e9a6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Oct 7 18:14:53 2017 +0200 ole32: Don't redefine htole32/htole16. On some systems these macros are already defined in usr/include/endian.h Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4fcfd9c..c628523 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -528,15 +528,23 @@ StgStreamImpl* StgStreamImpl_Construct( */ #ifdef WORDS_BIGENDIAN +#ifndef htole32 #define htole32(x) RtlUlongByteSwap(x) +#endif +#ifndef htole16 #define htole16(x) RtlUshortByteSwap(x) +#endif #define lendian32toh(x) RtlUlongByteSwap(x) #define lendian16toh(x) RtlUshortByteSwap(x) #else +#ifndef htole32 #define htole32(x) (x) +#endif +#ifndef htole16 #define htole16(x) (x) +#endif #define lendian32toh(x) (x) #define lendian16toh(x) (x)

1 0

Andrey Gusev : usp10: Remove redundant comparison.
by Alexandre Julliard Oct. 10, 2017

Oct. 10, 2017

Module: wine Branch: master Commit: a34adbefe452769d47377904c8269a08f02f3c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34adbefe452769d47377904c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 10 16:44:17 2017 +0300 usp10: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0b8c28e..59abbad 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2641,7 +2641,7 @@ HRESULT WINAPI ScriptCPtoX(int iCP, iPosX = 0.0; for (item=0; item < iCP && item < cChars; item++) { - if (iSpecial == -1 && (iCluster == -1 || (iCluster != -1 && iCluster+clust_size <= item))) + if (iSpecial == -1 && (iCluster == -1 || iCluster+clust_size <= item)) { int check; int clust = pwLogClust[item];

1 0