January 2017 - Wine-commits

Huw Davies : usp10/tests: Add a second set of glyph props that have changed in Windows 10.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 55c5a77b47258a86da12f3a1004242ad5e0df78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c5a77b47258a86da12f3a10… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 25 08:59:55 2017 +0000 usp10/tests: Add a second set of glyph props that have changed in Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 66 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e77f90e..0959699 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -927,8 +927,9 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, DWORD cchString, SCRIPT_CONTROL *Control, SCRIPT_STATE *State, DWORD item, DWORD nGlyphs, - const shapeTest_char* charItems, - const shapeTest_glyph* glyphItems) + const shapeTest_char *charItems, + const shapeTest_glyph *glyphItems, + const SCRIPT_GLYPHPROP *props2) { HRESULT hr; int x, outnItems=0, outnGlyphs=0; @@ -1014,19 +1015,27 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: Glyph present when it should not be\n",x); } if (valid > 0) - winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification, "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || + (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), + "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); else if (glyphProp[x].sva.uJustification != glyphItems[x].GlyphProp.sva.uJustification) winetest_trace("%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); if (valid > 0) - winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart, "%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); + winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart || + (props2 && glyphProp[x].sva.fClusterStart == props2[x].sva.fClusterStart), + "%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); else if (glyphProp[x].sva.fClusterStart != glyphItems[x].GlyphProp.sva.fClusterStart) winetest_trace("%i: fClusterStart incorrect (%i)\n",x,glyphProp[x].sva.fClusterStart); if (valid > 0) - winetest_ok(glyphProp[x].sva.fDiacritic == glyphItems[x].GlyphProp.sva.fDiacritic, "%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); + winetest_ok(glyphProp[x].sva.fDiacritic == glyphItems[x].GlyphProp.sva.fDiacritic || + (props2 && glyphProp[x].sva.fDiacritic == props2[x].sva.fDiacritic), + "%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); else if (glyphProp[x].sva.fDiacritic != glyphItems[x].GlyphProp.sva.fDiacritic) winetest_trace("%i: fDiacritic incorrect (%i)\n",x,glyphProp[x].sva.fDiacritic); if (valid > 0) - winetest_ok(glyphProp[x].sva.fZeroWidth == glyphItems[x].GlyphProp.sva.fZeroWidth, "%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); + winetest_ok(glyphProp[x].sva.fZeroWidth == glyphItems[x].GlyphProp.sva.fZeroWidth || + (props2 && glyphProp[x].sva.fZeroWidth == props2[x].sva.fZeroWidth), + "%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); else if (glyphProp[x].sva.fZeroWidth != glyphItems[x].GlyphProp.sva.fZeroWidth) winetest_trace("%i: fZeroWidth incorrect (%i)\n",x,glyphProp[x].sva.fZeroWidth); } @@ -1039,9 +1048,14 @@ cleanup: ScriptFreeCache(&sc); } -#define test_shape_ok(a,b,c,d,e,f,g,h,i) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(1,a,b,c,d,e,f,g,h,i) +#define test_shape_ok(a,b,c,d,e,f,g,h,i) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(1,a,b,c,d,e,f,g,h,i,NULL) -#define test_shape_ok_valid(v,a,b,c,d,e,f,g,h,i) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i) +#define test_shape_ok_valid(v,a,b,c,d,e,f,g,h,i) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i,NULL) + +#define test_shape_ok_valid_props2(v,a,b,c,d,e,f,g,h,i,j) \ + (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _test_shape_ok(v,a,b,c,d,e,f,g,h,i,j) typedef struct tagRangeP { BYTE range; @@ -1245,6 +1259,18 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + static const SCRIPT_GLYPHPROP phagspa_win10_props[] = { + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0} }; /* Lao */ static const WCHAR test_lao[] = {0x0ead, 0x0eb1, 0x0e81, 0x0eaa, 0x0ead, 0x0e99, 0x0ea5, 0x0eb2, 0x0ea7, 0}; @@ -1281,6 +1307,24 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + static const SCRIPT_GLYPHPROP tibetan_win10_props[] = { + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}, + {{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0} }; /* Devanagari */ static const WCHAR test_devanagari[] = {0x0926, 0x0947, 0x0935, 0x0928, 0x093e, 0x0917, 0x0930, 0x0940}; @@ -1464,7 +1508,8 @@ static void test_ScriptShapeOpenType(HDC hdc) test_valid = find_font_for_range(hdc, "Microsoft PhagsPa", 53, test_phagspa[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_phagspa, 11, &Control, &State, 0, 11, phagspa_c, phagspa_g); + test_shape_ok_valid_props2(test_valid, hdc, test_phagspa, 11, &Control, &State, 0, 11, + phagspa_c, phagspa_g, phagspa_win10_props); SelectObject(hdc, hfont_orig); DeleteObject(hfont); } @@ -1480,7 +1525,8 @@ static void test_ScriptShapeOpenType(HDC hdc) test_valid = find_font_for_range(hdc, "Microsoft Himalaya", 70, test_tibetan[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_tibetan, 17, &Control, &State, 0, 17, tibetan_c, tibetan_g); + test_shape_ok_valid_props2(test_valid, hdc, test_tibetan, 17, &Control, &State, 0, 17, + tibetan_c, tibetan_g, tibetan_win10_props); SelectObject(hdc, hfont_orig); DeleteObject(hfont); }

1 0

Masanori Kakura : winegstreamer: Avoid zero division in amt_from_gst_caps_video().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 442653b94ef21fad97a6cd82fe01bc95a79a52a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442653b94ef21fad97a6cd82f… Author: Masanori Kakura <kakurasan(a)gmail.com> Date: Wed Jan 25 23:02:20 2017 +0900 winegstreamer: Avoid zero division in amt_from_gst_caps_video(). Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c33ed9e..759a5db 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -233,9 +233,8 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) bih->biCompression = amt->subtype.Data1; } bih->biSizeImage = width * height * bih->biBitCount / 8; - vih->AvgTimePerFrame = 10000000; - vih->AvgTimePerFrame *= denom; - vih->AvgTimePerFrame /= nom; + if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, denom, nom)) == -1) + vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ vih->rcSource.left = 0; vih->rcSource.right = width; vih->rcSource.top = height;

1 0

Jactry Zeng : qcap: Release IBaseFilter.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: ca4227bdf47e88c198442b5e5139d15a768f0d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4227bdf47e88c198442b5e5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jan 25 10:42:32 2017 +0800 qcap: Release IBaseFilter. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 546b1f8..bae75f8 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -687,6 +687,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, if (FAILED(hr)) { WARN("Could not enumerate\n"); + IBaseFilter_Release(filter); return hr; } @@ -720,6 +721,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, break; } IEnumPins_Release(enumpins); + IBaseFilter_Release(filter); if (hr != S_OK) {

1 0

Austin English : kernel32: Add BaseFlushAppcompatCache stub.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 0df25df8288ca63d991545029b4ec28b8b512b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df25df8288ca63d991545029… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 16:38:26 2017 -0600 kernel32: Add BaseFlushAppcompatCache stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-appcompat-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/process.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec index 92a96af..e37c525 100644 --- a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec +++ b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec @@ -2,7 +2,7 @@ @ stub BaseCheckAppcompatCacheEx @ stub BaseCleanupAppcompatCacheSupport @ stub BaseDumpAppcompatCache -@ stub BaseFlushAppcompatCache +@ stdcall BaseFlushAppcompatCache() kernel32.BaseFlushAppcompatCache @ stub BaseFreeAppCompatDataForProcess @ stub BaseInitAppcompatCacheSupport @ stub BaseIsAppcompatInfrastructureDisabled diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 224e6ae..06b89de 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -167,11 +167,11 @@ @ stub BaseCheckAppcompatCache # @ stub BaseCheckAppcompatCacheEx # @ stub BaseCheckRunApp -@ stub BaseCleanupAppcompatCache +@ stub BaseCleanupAppcompatCache @ stub BaseCleanupAppcompatCacheSupport # @ stub BaseDllReadWriteIniFile @ stub BaseDumpAppcompatCache -@ stub BaseFlushAppcompatCache +@ stdcall BaseFlushAppcompatCache() # @ stub BaseFormatObjectAttributes # @ stub BaseFormatTimeOut # @ stub BaseGenerateAppCompatData diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2130240..17cb1db 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4207,3 +4207,13 @@ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *li { return; } + +/********************************************************************** + * BaseFlushAppcompatCache (KERNEL32.@) + */ +BOOL WINAPI BaseFlushAppcompatCache(void) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Christoph Brill : setupapi: Stub CM_Open_DevNode_Key and CM_Get_Child.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 6b055830059bfd7afeb4e63e44f32eb28afc6c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b055830059bfd7afeb4e63e4… Author: Christoph Brill <egore911(a)gmail.com> Date: Thu Jan 19 15:05:01 2017 +0100 setupapi: Stub CM_Open_DevNode_Key and CM_Get_Child. Signed-off-by: Christoph Brill <egore911(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-1.spec | 4 ++-- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 22 ++++++++++++++++++++++ include/cfgmgr32.h | 14 ++++++++++++++ 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index 4302bbf..7888d80 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -3,7 +3,7 @@ @ stub CM_Delete_DevNode_Key @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode -@ stub CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child @ stub CM_Get_Class_Property_Keys @ stub CM_Get_Class_PropertyW @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @@ -26,7 +26,7 @@ @ stub CM_MapCrToWin32Err @ stub CM_Open_Class_KeyW @ stub CM_Open_Device_Interface_KeyW -@ stub CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 116180c..4ca4d3c 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -42,7 +42,7 @@ @ stub CM_Free_Res_Des @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle -@ stub CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child @ stub CM_Get_Child_Ex @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @@ -133,7 +133,7 @@ @ stub CM_Open_Class_KeyW @ stub CM_Open_Class_Key_ExA @ stub CM_Open_Class_Key_ExW -@ stub CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key @ stub CM_Open_DevNode_Key_Ex @ stub CM_Query_Arbitrator_Free_Data @ stub CM_Query_Arbitrator_Free_Data_Ex diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 0eb8359..5c57c23 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -53,7 +53,7 @@ @ stub CM_Free_Res_Des @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle -@ stub CM_Get_Child +@ stdcall CM_Get_Child(ptr long long) @ stub CM_Get_Child_Ex @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @@ -144,7 +144,7 @@ @ stub CM_Open_Class_KeyW @ stub CM_Open_Class_Key_ExA @ stub CM_Open_Class_Key_ExW -@ stub CM_Open_DevNode_Key +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) @ stub CM_Open_DevNode_Key_Ex @ stub CM_Query_And_Remove_SubTreeA @ stub CM_Query_And_Remove_SubTreeW diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 6ecf240..9b71c1c 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -79,6 +79,28 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) } /*********************************************************************** + * CM_Open_DevNode_Key (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Open_DevNode_Key( + DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, + PHKEY phkDevice, ULONG ulFlags) +{ + FIXME("0x%08x 0x%08x 0x%08x 0x%08x %p 0x%08x : stub\n", dnDevInst, access, ulHardwareProfile, + disposition, phkDevice, ulFlags); + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Get_Child (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Child( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) +{ + FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, dnDevInst, ulFlags); + return CR_SUCCESS; +} + +/*********************************************************************** * CM_Get_Device_ID_ExA (SETUPAPI.@) */ DWORD WINAPI CM_Get_Device_ID_ExA( diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 7dc31e1..4606389 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -25,6 +25,8 @@ # include <guiddef.h> #endif +#include <winreg.h> + /* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ #ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */ @@ -158,11 +160,20 @@ typedef DWORD CONFIGRET; #define CM_CRP_MIN CM_DRP_MIN #define CM_CRP_MAX CM_DRP_MAX +#define RegDisposition_OpenAlways 0x00 +#define RegDisposition_OpenExisting 0x01 + +#define CM_REGISTRY_HARDWARE 0x0000 +#define CM_REGISTRY_SOFTWARE 0x0001 +#define CM_REGISTRY_USER 0x0100 +#define CM_REGISTRY_CONFIG 0x0200 + typedef DWORD DEVINST, *PDEVINST; typedef DWORD DEVNODE, *PDEVNODE; typedef HANDLE HMACHINE, *PHMACHINE; typedef CHAR *DEVNODEID_A, *DEVINSTID_A; typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; +typedef ULONG REGDISPOSITION; DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) @@ -196,6 +207,9 @@ CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) +CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, + REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Get_Child(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags); #ifdef __cplusplus }

1 0

Bruno Jesus : ntdll: Fake success if changing system date is a no-op.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: eefc1c471c6a3ef7b5cba390a022596edd9c4d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefc1c471c6a3ef7b5cba390a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 22 15:14:25 2017 -0200 ntdll: Fake success if changing system date is a no-op. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 96ffcfa..d232c4c 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -951,14 +951,21 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old RtlTimeToSecondsSince1970( NewTime, &sec ); + /* fake success if time didn't change */ + if (oldsec == sec) + return STATUS_SUCCESS; + /* set the new time */ tv.tv_sec = sec; tv.tv_usec = 0; #ifdef HAVE_SETTIMEOFDAY + tm_t = sec; if (!settimeofday(&tv, NULL)) /* 0 is OK, -1 is error */ + { + TRACE("OS time changed to %s\n", ctime(&tm_t)); return STATUS_SUCCESS; - tm_t = sec; + } ERR("Cannot set time to %s, time adjustment %ld: %s\n", ctime(&tm_t), (long)(sec-oldsec), strerror(errno)); if (errno == EPERM)

1 0

Gerald Pfeifer : rpcrt4: Avoid potential overflow in rpcrt4_protseq_ncacn_np_open_endpoint.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 042b41dd5705d6412236ed81d4a03aff7831c631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042b41dd5705d6412236ed81d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 21 16:32:22 2017 +0100 rpcrt4: Avoid potential overflow in rpcrt4_protseq_ncacn_np_open_endpoint. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 2537a3f..fb3edb4 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -346,7 +346,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse RPC_STATUS r; LPSTR pname; RpcConnection *Connection; - char generated_endpoint[21]; + char generated_endpoint[26]; if (!endpoint) {

1 0

Jacek Caban : mshtml: Initialize nsAString in IHTMLDocument3::get_dir.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 4823119a79152f7cf3808b9744e2143776970edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4823119a79152f7cf3808b974… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 24 13:26:25 2017 +0100 mshtml: Initialize nsAString in IHTMLDocument3::get_dir. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 47e087d..cf9344f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2207,6 +2207,7 @@ static HRESULT WINAPI HTMLDocument3_get_dir(IHTMLDocument3 *iface, BSTR *p) return E_UNEXPECTED; } + nsAString_Init(&dir_str, NULL); nsres = nsIDOMHTMLDocument_GetDir(This->doc_node->nsdoc, &dir_str); return return_nsstr(nsres, &dir_str, p); }

1 0

Zebediah Figura : ws2_32/tests: Fix memcmp size in test_TransmitFile().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: b655102ca38dd8120d5437d6aeae9289eb37cd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b655102ca38dd8120d5437d6a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 22 15:25:04 2017 -0600 ws2_32/tests: Fix memcmp size in test_TransmitFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5856718..7208088 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8296,17 +8296,17 @@ static void test_TransmitFile(void) /* Test TransmitFile with only buffer data */ buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); bret = pTransmitFile(client, NULL, 0, 0, NULL, &buffers, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); iret = recv(dest, buf, sizeof(buf), 0); - ok(iret == sizeof(header_msg)+sizeof(footer_msg)+2, + ok(iret == sizeof(header_msg)+sizeof(footer_msg), "Returned an unexpected buffer from TransmitFile: %d\n", iret ); - ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)+1) == 0, + ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); - ok(memcmp(&buf[sizeof(header_msg)+1], &footer_msg[0], sizeof(footer_msg)+1) == 0, + ok(memcmp(&buf[sizeof(header_msg)], &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test TransmitFile with only file data */ @@ -8316,18 +8316,18 @@ static void test_TransmitFile(void) /* Test TransmitFile with both file and buffer data */ buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); SetFilePointer(file, 0, NULL, FILE_BEGIN); bret = pTransmitFile(client, file, 0, 0, NULL, &buffers, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); - iret = recv(dest, buf, sizeof(header_msg)+1, 0); - ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + iret = recv(dest, buf, sizeof(header_msg), 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); compare_file(file, dest, 0); - iret = recv(dest, buf, sizeof(footer_msg)+1, 0); - ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + iret = recv(dest, buf, sizeof(footer_msg), 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test overlapped TransmitFile */ @@ -8381,9 +8381,9 @@ static void test_TransmitFile(void) goto cleanup; } buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); SetFilePointer(file, 0, NULL, FILE_BEGIN); ov.Offset = 0; bret = pTransmitFile(client, file, 0, 0, &ov, &buffers, 0); @@ -8396,12 +8396,12 @@ static void test_TransmitFile(void) ok(total_sent == (file_size + buffers.HeadLength + buffers.TailLength), "Overlapped TransmitFile sent an unexpected number of bytes (%d != %d).\n", total_sent, file_size + buffers.HeadLength + buffers.TailLength); - iret = recv(dest, buf, sizeof(header_msg)+1, 0); - ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + iret = recv(dest, buf, sizeof(header_msg), 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); compare_file(file, dest, 0); - iret = recv(dest, buf, sizeof(footer_msg)+1, 0); - ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + iret = recv(dest, buf, sizeof(footer_msg), 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test TransmitFile with a UDP datagram socket */

1 0

Huw Davies : schedsvc/tests: Early versions of Windows 10 return S_OK whether or not the element exists.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: bdec0b20317b413514663c041ceac7f206ea4692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdec0b20317b413514663c041… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 23 11:01:46 2017 +0000 schedsvc/tests: Early versions of Windows 10 return S_OK whether or not the element exists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 7aeea17..044118e 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -148,7 +148,9 @@ START_TEST(rpcapi) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = SchRpcDelete(Wine, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + broken(hr == S_OK), /* Early versions of Win 10 */ + "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = SchRpcDelete(empty, 0); ok(hr == E_ACCESSDENIED /* win7 */ || hr == E_INVALIDARG /* vista */, "expected E_ACCESSDENIED, got %#x\n", hr);

1 0