January 2017 - Wine-Commits

Aric Stewart : usp10: Fix Contextual Shaping for Languages with RTL write order.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 10e9adfb27ef9ea5e0ee7a9c4bc9cea0480d7527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e9adfb27ef9ea5e0ee7a9c4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 11:31:15 2017 -0600 usp10: Fix Contextual Shaping for Languages with RTL write order. Including Arabic, Syriac, Phags pa, and Mongolian. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 124 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 94 insertions(+), 30 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1c8d064..850e929 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1072,6 +1072,8 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1115,8 +1117,12 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { BOOL shaped = FALSE; @@ -1124,29 +1130,34 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { - i = nextIndex; - UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + UpdateClusters(glyph_index, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); + char_index += dirL; + glyph_index = nextIndex; } shaped = (nextIndex > GSUB_E_NOGLYPH); } if (!shaped) { - if (context_shape[i] == Xn) + if (context_shape[char_index] == Xn) { - WORD newGlyph = pwOutGlyphs[i]; - if (pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) + WORD newGlyph = pwOutGlyphs[glyph_index]; + if (pwcChars[char_index] >= FIRST_ARABIC_CHAR && pwcChars[char_index] <= LAST_ARABIC_CHAR) { /* fall back to presentation form B */ - WCHAR context_char = wine_shaping_forms[pwcChars[i] - FIRST_ARABIC_CHAR][context_shape[i]]; - if (context_char != pwcChars[i] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) - pwOutGlyphs[i] = newGlyph; + WCHAR context_char = wine_shaping_forms[pwcChars[char_index] - FIRST_ARABIC_CHAR][context_shape[char_index]]; + if (context_char != pwcChars[char_index] && GetGlyphIndicesW(hdc, &context_char, 1, &newGlyph, 0) != GDI_ERROR && newGlyph != 0x0000) + pwOutGlyphs[glyph_index] = newGlyph; } } - i++; + char_index += dirL; + glyph_index += dirL; } } @@ -1293,6 +1304,8 @@ static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1355,19 +1368,45 @@ right_join_causing(neighbour_joining_type(i,dirR,context_type,cChars,psa))) } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { - INT nextIndex; + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + + /* Apply the contextual feature */ + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + char_index += dirL; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -1427,6 +1466,8 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS INT *context_shape; INT dirR, dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -1475,24 +1516,36 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { - if (context_shape[i] >= 0) + if (context_shape[char_index] >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape); @@ -2769,6 +2822,8 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS INT *context_shape; INT dirL; int i; + int char_index; + int glyph_index; if (*pcGlyphs != cChars) { @@ -2805,19 +2860,28 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } /* Contextual Shaping */ - i = 0; - while(i < *pcGlyphs) + if (dirL > 0) + char_index = glyph_index = 0; + else + char_index = glyph_index = cChars-1; + + while(char_index < cChars && char_index >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); + if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); - i = nextIndex; + glyph_index = nextIndex; + char_index += dirL; } else - i++; + { + char_index += dirL; + glyph_index += dirL; + } } HeapFree(GetProcessHeap(),0,context_shape);

1 0

Bruno Jesus : dinput: Downgrade a FIXME to WARN in JoystickWImpl_SendForceFeedbackCommand.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 2d2d83324865d50f0b543c9df9940821b1cf324c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2d83324865d50f0b543c9df… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:02 2017 -0200 dinput: Downgrade a FIXME to WARN in JoystickWImpl_SendForceFeedbackCommand. All valid commands are already there, anything else is an app bug. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 44d72fc..790802d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1351,7 +1351,7 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE } case DISFFC_PAUSE: case DISFFC_CONTINUE: - FIXME("No support for Pause or Continue in linux\n"); + FIXME("No support for Pause or Continue in linux\n"); break; case DISFFC_SETACTUATORSOFF: @@ -1360,8 +1360,8 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE break; default: - FIXME("Unknown Force Feedback Command!\n"); - return DIERR_INVALIDPARAM; + WARN("Unknown Force Feedback Command %u!\n", dwFlags); + return DIERR_INVALIDPARAM; } return DI_OK; #else

1 0

Andrey Gusev : setupapi: Add CM_Get_Sibling_Ex stub.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 1ce40299941f03fb14ca73e771c1d6ea0090165a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce40299941f03fb14ca73e77… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 27 15:19:44 2017 +0200 setupapi: Add CM_Get_Sibling_Ex stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 5 +++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index efc5dbb..2ccd29b 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -113,7 +113,7 @@ @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling -@ stub CM_Get_Sibling_Ex +@ stdcall CM_Get_Sibling_Ex(ptr long long ptr) setupapi.CM_Get_Sibling_Ex @ stdcall CM_Get_Version() setupapi.CM_Get_Version @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 88476d6..ab2090d 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -124,7 +124,7 @@ @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling -@ stub CM_Get_Sibling_Ex +@ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a738eec..9ea23b7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -499,6 +499,16 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON return CR_FAILURE; } +/*********************************************************************** + * CM_Get_Sibling_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Sibling_Ex( + PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, DevInst, ulFlags, hMachine); + return CR_FAILURE; +} + CONFIGRET WINAPI CM_Reenumerate_DevNode(DEVINST dnDevInst, ULONG ulFlags) { FIXME("0x%08x 0x%08x: stub\n", dnDevInst, ulFlags); diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 8573067..b8def60 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -189,6 +189,8 @@ CMAPI CONFIGRET WINAPI CM_Create_DevNodeA(PDEVINST,DEVINSTID_A,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Create_DevNodeW(PDEVINST,DEVINSTID_W,DEVINST,ULONG); #define CM_Create_DevNode WINELIB_NAME_AW(CM_Create_DevNode) CMAPI CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Child(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Get_Child_Ex(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST,PSTR,ULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST,PWSTR,ULONG,ULONG); #define CM_Get_Device_ID WINELIB_NAME_AW(CM_Get_Device_ID) @@ -203,14 +205,13 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); 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); -CMAPI CONFIGRET WINAPI CM_Get_Child_Ex(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine); #ifdef __cplusplus }

1 0

Aric Stewart : hid: Implement HidP_MaxDataListLength.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 6bf21e1a5443b98860d0acd2e134dae0f13f0f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf21e1a5443b98860d0acd2e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 07:17:53 2017 -0600 hid: Implement HidP_MaxDataListLength. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 20 ++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 205b626..fe8002e 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -32,7 +32,7 @@ @ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stdcall HidP_InitializeReportForID(long long ptr ptr long) -@ stub HidP_MaxDataListLength +@ stdcall HidP_MaxDataListLength(long ptr) @ stdcall HidP_MaxUsageListLength(long long ptr) @ stub HidP_SetData @ stub HidP_SetScaledUsageValue diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index d031b67..da57665 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -763,3 +763,23 @@ NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollect return rc; } + +ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData) +{ + WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA *)PreparsedData; + TRACE("(%i, %p)\n", ReportType, PreparsedData); + if (data->magic != HID_MAGIC) + return 0; + + switch(ReportType) + { + case HidP_Input: + return data->caps.NumberInputDataIndices; + case HidP_Output: + return data->caps.NumberOutputDataIndices; + case HidP_Feature: + return data->caps.NumberFeatureDataIndices; + default: + return 0; + } +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 2b0eebd..902fa79 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -181,6 +181,7 @@ NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, UL NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Jacek Caban : inetcomm: Test current encoding in test_SetData.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 3c8f5c581d93c36b04c58de35d27b0397c56de52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8f5c581d93c36b04c58de35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 16:00:20 2017 +0100 inetcomm: Test current encoding in test_SetData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 9fbaeec..5d7bb9a 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -131,6 +131,17 @@ static IStream *create_stream_from_string(const char *data) return stream; } +#define test_current_encoding(a,b) _test_current_encoding(__LINE__,a,b) +static void _test_current_encoding(unsigned line, IMimeBody *mime_body, ENCODINGTYPE encoding) +{ + ENCODINGTYPE current_encoding; + HRESULT hres; + + hres = IMimeBody_GetCurrentEncoding(mime_body, &current_encoding); + ok_(__FILE__,line)(hres == S_OK, "GetCurrentEncoding failed: %08x\n", hres); + ok_(__FILE__,line)(current_encoding == encoding, "encoding = %d, expected %d\n", current_encoding, encoding); +} + static void test_CreateBody(void) { HRESULT hr; @@ -158,9 +169,7 @@ static void test_CreateBody(void) hr = IMimeBody_InitNew(body); ok(hr == S_OK, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(body, &enc); - ok(hr == S_OK, "ret %08x\n", hr); - ok(enc == IET_7BIT, "encoding %d\n", enc); + test_current_encoding(body, IET_7BIT); hr = IMimeBody_Load(body, in); ok(hr == S_OK, "ret %08x\n", hr); @@ -445,6 +454,8 @@ static void test_SetData(void) todo_wine ok(hr == S_OK, "ret %08x\n", hr); + test_current_encoding(body, IET_BINARY); + SET_EXPECT(Stream_Stat); SET_EXPECT(Stream_Seek_END); hr = IMimeBody_GetData(body, IET_BINARY, &stream);

1 0

Aric Stewart : usp10: Apply 'ccmp' before Arabic contextual shaping.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 0c1419542fa61d6eaacd0a007074cbb3a12605a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1419542fa61d6eaacd0a007… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 11:31:51 2017 -0600 usp10: Apply 'ccmp' before Arabic contextual shaping. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 850e929..bf333b2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1128,9 +1128,19 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p if (psc->GSUB_Table) { - INT nextIndex; + INT nextIndex, offset = 0; INT prevCount = *pcGlyphs; + /* Apply CCMP first */ + apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, "ccmp"); + + if (prevCount != *pcGlyphs) + { + offset = *pcGlyphs - prevCount; + if (dirL < 0) + glyph_index -= offset * dirL; + } + /* Apply the contextual feature */ nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, glyph_index, dirL, pcGlyphs, contextual_features[context_shape[char_index]]); @@ -1138,7 +1148,13 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p { UpdateClusters(glyph_index, *pcGlyphs - prevCount, dirL, cChars, pwLogClust); char_index += dirL; - glyph_index = nextIndex; + if (!offset) + glyph_index = nextIndex; + else + { + offset = *pcGlyphs - prevCount; + glyph_index += dirL * (offset + 1); + } } shaped = (nextIndex > GSUB_E_NOGLYPH); }

1 0

Bruno Jesus : dinput: DISFFC_RESET will not release the effects.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 27f456844b8195dac09bfce0c4cc906236462a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f456844b8195dac09bfce0c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:03 2017 -0200 dinput: DISFFC_RESET will not release the effects. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 790802d..f62893b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1331,9 +1331,9 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE { case DISFFC_STOPALL: { - /* Stop all effects */ effect_list_item *itr; + /* Stop all effects */ LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) IDirectInputEffect_Stop(itr->ref); break; @@ -1341,12 +1341,14 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE case DISFFC_RESET: { - effect_list_item *itr, *ptr; + effect_list_item *itr; - /* Stop, unload, release and free all effects */ - /* This returns the device to its "bare" state */ - LIST_FOR_EACH_ENTRY_SAFE(itr, ptr, &This->ff_effects, effect_list_item, entry) - IDirectInputEffect_Release(itr->ref); + /* Stop and unload all effects. It is not true that effects are released */ + LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) + { + IDirectInputEffect_Stop(itr->ref); + IDirectInputEffect_Unload(itr->ref); + } break; } case DISFFC_PAUSE:

1 0

Bruno Jesus : dinput: Simplify JoystickWImpl_Unacquire for Linux.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 8339de07ca51723faf3ff25f81f331233f337c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8339de07ca51723faf3ff25f8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:04 2017 -0200 dinput: Simplify JoystickWImpl_Unacquire for Linux. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index f62893b..910e755 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -88,6 +88,8 @@ HRESULT linuxinput_create_effect(int* fd, REFGUID rguid, struct list *parent_lis HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info); HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info); +static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags); + typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; static const IDirectInputDevice8WVtbl JoystickWvt; @@ -745,18 +747,10 @@ static HRESULT WINAPI JoystickWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) TRACE("(this=%p)\n",This); res = IDirectInputDevice2WImpl_Unacquire(iface); if (res==DI_OK && This->joyfd!=-1) { - effect_list_item *itr; struct input_event event; - /* For each known effect: - * - stop it - * - unload it - * But, unlike DISFFC_RESET, do not release the effect. - */ - LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) { - IDirectInputEffect_Stop(itr->ref); - IDirectInputEffect_Unload(itr->ref); - } + /* Stop and unload all effects */ + JoystickWImpl_SendForceFeedbackCommand(iface, DISFFC_RESET); /* Enable autocenter. */ event.type = EV_FF;

1 0

Louis Lenders : xmllite/reader: Handle NULL node type argument in Read().
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 33d8a323d01f36785ea3db0f7c95eda5c36bea07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d8a323d01f36785ea3db0f7… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Jan 27 11:17:42 2017 +0300 xmllite/reader: Handle NULL node type argument in Read(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1bb1cab..1e3c7aa 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2777,7 +2777,8 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) if (hr == S_OK) { TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); - *nodetype = This->nodetype; + if (nodetype) + *nodetype = This->nodetype; } return hr;

1 0

Andrey Gusev : setupapi: Add CM_Get_Child_Ex stub.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: afa920a73fbcea3fd9459b1b53976ab1b6e99735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa920a73fbcea3fd9459b1b5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 27 14:32:30 2017 +0200 setupapi: Add CM_Get_Child_Ex stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 9551fc0..efc5dbb 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -43,7 +43,7 @@ @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle @ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child -@ stub CM_Get_Child_Ex +@ stdcall CM_Get_Child_Ex(ptr long long ptr) setupapi.CM_Get_Child_Ex @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @ stub CM_Get_Class_Key_Name_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index e77369b..88476d6 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -54,7 +54,7 @@ @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle @ stdcall CM_Get_Child(ptr long long) -@ stub CM_Get_Child_Ex +@ stdcall CM_Get_Child_Ex(ptr long long ptr) @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @ stub CM_Get_Class_Key_Name_ExA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 9b71c1c..a738eec 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -101,6 +101,16 @@ CONFIGRET WINAPI CM_Get_Child( } /*********************************************************************** + * CM_Get_Child_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Child_Ex( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + 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 4606389..8573067 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -210,6 +210,7 @@ CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); 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); +CMAPI CONFIGRET WINAPI CM_Get_Child_Ex(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine); #ifdef __cplusplus }

1 0