November 2011 - Wine-commits

Michael Stefaniuc : include: Drop "l" modifiers from numeric constants in shlguid.h.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 4e3a581d16893e4223f2c4da972b253b5c2a6c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3a581d16893e4223f2c4da9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 21 01:10:15 2011 +0100 include: Drop "l" modifiers from numeric constants in shlguid.h. --- include/shlguid.h | 96 ++++++++++++++++++++++++++-------------------------- 1 files changed, 48 insertions(+), 48 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index f01ec73..ebae98d 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -19,61 +19,61 @@ #ifndef __WINE_SHLGUID_H #define __WINE_SHLGUID_H -DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); +DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400, 0, 0); -DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); -DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); -DEFINE_OLEGUID(CATID_DeskBand, 0x00021492L, 0, 0); -DEFINE_OLEGUID(CATID_InfoBand, 0x00021493L, 0, 0); -DEFINE_OLEGUID(CATID_CommBand, 0x00021494L, 0, 0); +DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490, 0, 0); +DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491, 0, 0); +DEFINE_OLEGUID(CATID_DeskBand, 0x00021492, 0, 0); +DEFINE_OLEGUID(CATID_InfoBand, 0x00021493, 0, 0); +DEFINE_OLEGUID(CATID_CommBand, 0x00021494, 0, 0); /* shell32 formatids */ -DEFINE_OLEGUID(FMTID_Intshcut, 0x000214A0L, 0, 0); -DEFINE_OLEGUID(FMTID_InternetSite, 0x000214A1L, 0, 0); +DEFINE_OLEGUID(FMTID_Intshcut, 0x000214A0, 0, 0); +DEFINE_OLEGUID(FMTID_InternetSite, 0x000214A1, 0, 0); /* command group ids */ -DEFINE_OLEGUID(CGID_Explorer, 0x000214D0L, 0, 0); -DEFINE_OLEGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); -DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); -DEFINE_OLEGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); - -DEFINE_OLEGUID(IID_IShellDetails, 0x000214ECL, 0, 0); -DEFINE_OLEGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); -DEFINE_OLEGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); -DEFINE_OLEGUID(IID_IFileViewerA, 0x000214F0L, 0, 0); -DEFINE_OLEGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0); -DEFINE_OLEGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); -DEFINE_OLEGUID(IID_IFileViewerW, 0x000214F8L, 0, 0); -DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0); -DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); -DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500L, 0, 0); - -DEFINE_GUID(IID_IACList, 0x77A130B0L,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); -DEFINE_GUID(IID_IACList2, 0x470141A0L,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); -DEFINE_GUID(IID_IObjMgr, 0x00BB2761L,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_OLEGUID(CGID_Explorer, 0x000214D0, 0, 0); +DEFINE_OLEGUID(CGID_ShellDocView, 0x000214D1, 0, 0); +DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2, 0, 0); +DEFINE_OLEGUID(CGID_ExplorerBarDoc, 0x000214D3, 0, 0); + +DEFINE_OLEGUID(IID_IShellDetails, 0x000214EC, 0, 0); +DEFINE_OLEGUID(IID_IDelayedRelease, 0x000214ED, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookA, 0x000214EF, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerA, 0x000214F0, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerSite, 0x000214F3, 0, 0); +DEFINE_OLEGUID(IID_IPropSheetPage, 0x000214F6, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerW, 0x000214F8, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FC, 0, 0); +DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FE, 0, 0); +DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500, 0, 0); + +DEFINE_GUID(IID_IACList, 0x77A130B0,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_GUID(IID_IACList2, 0x470141A0,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); +DEFINE_GUID(IID_IObjMgr, 0x00BB2761,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); /* avoid duplicate definitions with shobjidl.h (FIXME) */ -/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ -/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ -/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ -/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ -/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ -/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EB, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FA, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4, 0, 0); */ +/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8, 0, 0); */ +/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EA, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EE, 0, 0); */ +/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FB, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7, 0, 0); */ DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory @@ -98,9 +98,9 @@ DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, #define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook) #define IID_INewShortcutHook WINELIB_NAME_AW(IID_INewShortcutHook) -DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); -DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); -DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_GUID(IID_IInputObject, 0x68284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); +DEFINE_GUID(IID_IInputObjectSite, 0xF1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); /**************************************************************************** * the next IID's are the namespace elements of the pidls

1 0

Michael Stefaniuc : include: Drop some superfluous l modifiers from numeric constants.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: f869a1618667c57c94a0eb8fe82a47ca7946c37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f869a1618667c57c94a0eb8fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 21 01:11:46 2011 +0100 include: Drop some superfluous l modifiers from numeric constants. --- include/advpub.h | 2 +- include/prsht.h | 14 +++++++------- include/sti.h | 2 +- include/strsafe.h | 6 +++--- include/winhttp.h | 2 +- include/wininet.h | 2 +- include/winioctl.h | 4 ++-- include/winsock2.h | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/advpub.h b/include/advpub.h index c31df33..b213b1f 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -26,7 +26,7 @@ extern "C" { #endif #ifndef S_ASYNCHRONOUS -#define S_ASYNCHRONOUS _HRESULT_TYPEDEF_(0x401E8L) +#define S_ASYNCHRONOUS _HRESULT_TYPEDEF_(0x401E8) #endif typedef struct _CabInfoA diff --git a/include/prsht.h b/include/prsht.h index d538c8e..21fc266 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -454,25 +454,25 @@ typedef struct _PSHNOTIFY SNDMSG(hDlg, PSM_ADDPAGE, 0, (LPARAM)hpage) #define PropSheet_Changed(hDlg, hwnd) \ - SNDMSG(hDlg, PSM_CHANGED, (WPARAM)hwnd, 0L) + SNDMSG(hDlg, PSM_CHANGED, (WPARAM)hwnd, 0) #define PropSheet_RestartWindows(hDlg) \ - SNDMSG(hDlg, PSM_RESTARTWINDOWS, 0, 0L) + SNDMSG(hDlg, PSM_RESTARTWINDOWS, 0, 0) #define PropSheet_RebootSystem(hDlg) \ - SNDMSG(hDlg, PSM_REBOOTSYSTEM, 0, 0L) + SNDMSG(hDlg, PSM_REBOOTSYSTEM, 0, 0) #define PropSheet_CancelToClose(hDlg) \ - PostMessage(hDlg, PSM_CANCELTOCLOSE, 0, 0L) + PostMessage(hDlg, PSM_CANCELTOCLOSE, 0, 0) #define PropSheet_QuerySiblings(hDlg, wParam, lParam) \ SNDMSG(hDlg, PSM_QUERYSIBLINGS, wParam, lParam) #define PropSheet_UnChanged(hDlg, hwnd) \ - SNDMSG(hDlg, PSM_UNCHANGED, (WPARAM)hwnd, 0L) + SNDMSG(hDlg, PSM_UNCHANGED, (WPARAM)hwnd, 0) #define PropSheet_Apply(hDlg) \ - SNDMSG(hDlg, PSM_APPLY, 0, 0L) + SNDMSG(hDlg, PSM_APPLY, 0, 0) #define PropSheet_SetTitle(hDlg, wStyle, lpszText)\ SNDMSG(hDlg, PSM_SETTITLE, wStyle, (LPARAM)(LPCTSTR)lpszText) @@ -496,7 +496,7 @@ typedef struct _PSHNOTIFY (BOOL)SNDMSG(hDlg, PSM_ISDIALOGMESSAGE, 0, (LPARAM)pMsg) #define PropSheet_GetCurrentPageHwnd(hDlg) \ - (HWND)SNDMSG(hDlg, PSM_GETCURRENTPAGEHWND, 0, 0L) + (HWND)SNDMSG(hDlg, PSM_GETCURRENTPAGEHWND, 0, 0) #define PropSheet_InsertPage(hDlg, index, hpage) \ SNDMSG(hDlg, PSM_INSERTPAGE, (WPARAM)(index), (LPARAM)(hpage)) diff --git a/include/sti.h b/include/sti.h index 204492d..cda2c1c 100644 --- a/include/sti.h +++ b/include/sti.h @@ -29,7 +29,7 @@ extern "C" { #endif -DEFINE_GUID(CLSID_Sti, 0xB323F8E0L, 0x2E68, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6C); +DEFINE_GUID(CLSID_Sti, 0xB323F8E0, 0x2E68, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6C); DEFINE_GUID(IID_IStillImageW, 0x641BD880, 0x2DC8, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6C); diff --git a/include/strsafe.h b/include/strsafe.h index 2beb53f..842075f 100644 --- a/include/strsafe.h +++ b/include/strsafe.h @@ -25,8 +25,8 @@ /* Windows version includes this header. */ /* #include <specstring.h> */ -#define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) -#define STRSAFE_E_INVALID_PARAM ((HRESULT)0x80070075L) -#define STRSAFE_E_END_OF_FILE ((HRESULT)0x80070026L) +#define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007A) +#define STRSAFE_E_INVALID_PARAM ((HRESULT)0x80070075) +#define STRSAFE_E_END_OF_FILE ((HRESULT)0x80070026) #endif diff --git a/include/winhttp.h b/include/winhttp.h index 077c277..b54bd92 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -408,7 +408,7 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE \ | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR) #define WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS 0xffffffff -#define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1L)) +#define WINHTTP_INVALID_STATUS_CALLBACK ((WINHTTP_STATUS_CALLBACK)(-1)) #define API_RECEIVE_RESPONSE (1) #define API_QUERY_DATA_AVAILABLE (2) diff --git a/include/wininet.h b/include/wininet.h index ce09821..6db41ca 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -687,7 +687,7 @@ INTERNETAPI INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW(HINTERNET #define INTERNET_STATE_IDLE 0x00000100 #define INTERNET_STATE_BUSY 0x00000200 -#define INTERNET_INVALID_STATUS_CALLBACK ((INTERNET_STATUS_CALLBACK)(-1L)) +#define INTERNET_INVALID_STATUS_CALLBACK ((INTERNET_STATUS_CALLBACK)(-1)) #define FTP_TRANSFER_TYPE_UNKNOWN 0x00000000 #define FTP_TRANSFER_TYPE_ASCII 0x00000001 diff --git a/include/winioctl.h b/include/winioctl.h index 3a56d17..36d6e24 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -457,9 +457,9 @@ typedef struct _FILE_PIPE_PEEK_BUFFER { /* Device GUIDs */ #ifdef DEFINE_GUID -DEFINE_GUID(GUID_DEVINTERFACE_COMPORT, 0x86E0D1E0L, 0x8089, +DEFINE_GUID(GUID_DEVINTERFACE_COMPORT, 0x86E0D1E0, 0x8089, 0x11D0, 0x9C, 0xE4, 0x08, 0x00, 0x3E, 0x30, 0x1F, 0x73); -DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978L, 0xE325, +DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); /* obsolete GUID names */ diff --git a/include/winsock2.h b/include/winsock2.h index 5e1f489..b884587 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -359,7 +359,7 @@ typedef struct _OVERLAPPED* LPWSAOVERLAPPED; #define WSA_INVALID_EVENT ((WSAEVENT)NULL) #define WSA_MAXIMUM_WAIT_EVENTS (MAXIMUM_WAIT_OBJECTS) -#define WSA_WAIT_FAILED ((DWORD)-1L) +#define WSA_WAIT_FAILED ((DWORD)-1) #define WSA_WAIT_EVENT_0 (WAIT_OBJECT_0) #define WSA_WAIT_IO_COMPLETION (WAIT_IO_COMPLETION) #define WSA_WAIT_TIMEOUT (WAIT_TIMEOUT)

1 0

Aric Stewart : usp10: In Arabic only fallback to presentation form B for isolated glyphs.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: ed15053837cada42ae3eb3cd59f229d4beb46581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed15053837cada42ae3eb3cd5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:02:58 2011 -0700 usp10: In Arabic only fallback to presentation form B for isolated glyphs. --- dlls/usp10/shape.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7464b4a..bd383b9 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1567,13 +1567,16 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p if (!shaped) { - WORD newGlyph = pwOutGlyphs[i]; - if (pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) + if (context_shape[i] == Xn) { - /* 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; + WORD newGlyph = pwOutGlyphs[i]; + if (pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= 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; + } } i++; }

1 0

Aric Stewart : usp10: Improve handling for ZWJ and ZWNJ in itemization.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: bba75dd0a71645103cf3d6c094a3eaa3f010fdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba75dd0a71645103cf3d6c09… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:03:53 2011 -0700 usp10: Improve handling for ZWJ and ZWNJ in itemization. --- dlls/usp10/usp10.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 535441f..ce4dbcd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -866,6 +866,28 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int last_indic = base_indic(scripts[i]); } + for (i = 0; i < cInChars; i++) + { + /* Joiners get merged preferencially right */ + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + { + int j; + if (i+1 == cInChars) + scripts[i] = scripts[i-1]; + else + { + for (j = i+1; j < cInChars; j++) + { + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + { + scripts[i] = scripts[j]; + break; + } + } + } + } + } + if (psState && psControl) { levels = heap_alloc_zero(cInChars * sizeof(WORD)); @@ -899,9 +921,9 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); - /* Script_Numeric and select puncuation at level 0 get bumped to level 2 */ for (i = 0; i < cInChars; i++) { + /* Script_Numeric and select puncuation at level 0 get bumped to level 2 */ if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) { scripts[i] = Script_Numeric; @@ -914,6 +936,21 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } else inNumber = FALSE; + + /* Joiners get merged preferencially right */ + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + { + int j; + if (i+1 == cInChars && levels[i-1] == levels[i]) + strength[i] = strength[i-1]; + else + for (j = i+1; j < cInChars && levels[i] == levels[j]; j++) + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + { + strength[i] = strength[j]; + break; + } + } } if (psControl->fMergeNeutralItems) { @@ -956,7 +993,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } } - while ((!levels || (levels && levels[cnt+1] == levels[0])) && (pwcInChars[cnt] == Numeric_space || pwcInChars[cnt] == ZWJ || pwcInChars[cnt] == ZWNJ) && cnt < cInChars) + while ((!levels || (levels && levels[cnt+1] == levels[0])) && (pwcInChars[cnt] == Numeric_space) && cnt < cInChars) cnt++; if (cnt == cInChars) /* All Spaces */ @@ -1000,12 +1037,12 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (cnt=1; cnt < cInChars; cnt++) { - if(pwcInChars[cnt] != Numeric_space && pwcInChars[cnt] != ZWJ && pwcInChars[cnt] != ZWNJ) + if(pwcInChars[cnt] != Numeric_space) New_Script = scripts[cnt]; else if (levels) { int j = 1; - while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ) && levels[cnt] == levels[cnt+j]) + while (cnt + j < cInChars - 1 && pwcInChars[cnt+j] == Numeric_space && levels[cnt] == levels[cnt+j]) j++; if (cnt + j < cInChars && levels[cnt] == levels[cnt+j]) New_Script = scripts[cnt+j];

1 0

Aric Stewart : usp10: Some unicode code points will force us into bidi mode .
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: fce22eadc1cfa6ced6f0f79a2b6a781c82a7916c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce22eadc1cfa6ced6f0f79a2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:04:13 2011 -0700 usp10: Some unicode code points will force us into bidi mode. --- dlls/usp10/usp10.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ce4dbcd..06cde93 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -844,6 +844,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int BOOL new_run; WORD last_indic = -1; WORD layoutRTL = 0; + BOOL forceLevels = FALSE; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -864,6 +865,11 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int scripts[i] = last_indic; else if (is_indic(scripts[i])) last_indic = base_indic(scripts[i]); + + /* Some unicode points (Zero Width Space U+200B - + Right-to-Left Mark U+200F) will force us into bidi mode */ + if (!forceLevels && pwcInChars[i] >= 0x200B && pwcInChars[i] <= 0x200F) + forceLevels = TRUE; } for (i = 0; i < cInChars; i++) @@ -902,7 +908,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (i = 0; i < cInChars; i++) if (levels[i]!=levels[0]) break; - if (i >= cInChars && !odd(baselevel) && !odd(psState->uBidiLevel)) + if (i >= cInChars && !odd(baselevel) && !odd(psState->uBidiLevel) && !forceLevels) { heap_free(levels); levels = NULL;

1 0

Aric Stewart : usp10: Add a facility to mark itemization test elements as broken.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 2abb8193b9a7376207f30f406ee8fe3ad739f9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abb8193b9a7376207f30f406… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:04:35 2011 -0700 usp10: Add a facility to mark itemization test elements as broken. --- dlls/usp10/tests/usp10.c | 130 +++++++++++++++++++++++++--------------------- 1 files changed, 71 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2abb8193b9a7376207f30…

1 0

Aric Stewart : usp10: Handle Combining Diacritical Marks.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 714408684dbbc269d4d321d5b5f2d01f84d48dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=714408684dbbc269d4d321d5b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:05:00 2011 -0700 usp10: Handle Combining Diacritical Marks. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 16 ++++++++++++++++ dlls/usp10/usp10.c | 23 ++++++++++++++++++++++- dlls/usp10/usp10_internal.h | 2 ++ 4 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bd383b9..3662bc8 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -582,6 +582,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 492564e..ede7603 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -277,6 +277,14 @@ static void test_ScriptItemize( void ) static const itemTest t191[2] = {{{0,0,0,0,0},0,0,0,0,mlym_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; static const itemTest t192[2] = {{{0,0,0,0,0},0,0,0,2,mlym_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + /* Diacritical */ + static const WCHAR test20[] = {0x0309,'a','b','c','d',0}; + static const itemTest t201[3] = {{{0,0,0,0,0},0,0,0,0,0x0,FALSE},{{0,0,0,0,0},1,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; + static const itemTest t202[3] = {{{0,0,0,0,0},0,0,0,2,0,TRUE,{-1,1,1,1,-1}},{{0,0,0,0,0},1,0,0,2,latn_tag,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; + + static const WCHAR test21[] = {0x0710, 0x0712, 0x0308, 0x0712, 0x0714,0}; + static const itemTest t211[2] = {{{0,0,0,0,0},0,1,1,1,syrc_tag,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -329,6 +337,8 @@ static void test_ScriptItemize( void ) test_items_ok(test17,6,NULL,NULL,1,t171,FALSE,0); test_items_ok(test18,5,NULL,NULL,1,t181,FALSE,0); test_items_ok(test19,6,NULL,NULL,1,t191,FALSE,0); + test_items_ok(test20,5,NULL,NULL,2,t201,FALSE,0); + test_items_ok(test21,5,NULL,NULL,1,t211,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -355,6 +365,8 @@ static void test_ScriptItemize( void ) test_items_ok(test17,6,&Control,&State,1,t171,FALSE,0); test_items_ok(test18,5,&Control,&State,1,t181,FALSE,0); test_items_ok(test19,6,&Control,&State,1,t191,FALSE,0); + test_items_ok(test20,5,&Control,&State,2,t201,FALSE,0); + test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -381,6 +393,8 @@ static void test_ScriptItemize( void ) test_items_ok(test17,6,&Control,&State,1,t172,FALSE,0); test_items_ok(test18,5,&Control,&State,1,t182,FALSE,0); test_items_ok(test19,6,&Control,&State,1,t192,FALSE,0); + test_items_ok(test20,5,&Control,&State,2,t202,FALSE,0); + test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -408,6 +422,8 @@ static void test_ScriptItemize( void ) test_items_ok(test17,6,&Control,&State,1,t172,FALSE,0); test_items_ok(test18,5,&Control,&State,1,t182,FALSE,0); test_items_ok(test19,6,&Control,&State,1,t192,FALSE,0); + test_items_ok(test20,5,&Control,&State,2,t202,FALSE,0); + test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 06cde93..ae3a7b4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -57,6 +57,8 @@ static const scriptRange scriptRanges[] = { /* Latin Extended-B: U+0180–U+024F */ /* IPA Extensions: U+0250–U+02AF */ { Script_Latin, 0x00, 0x2af , Script_Numeric, Script_Punctuation}, + /* Combining Diacritical Marks : U+0300–U+036F */ + { Script_Diacritical,0x300, 0x36f, 0, 0}, /* Greek: U+0370–U+03FF */ { Script_Greek, 0x370, 0x3ff, 0, 0}, /* Cyrillic: U+0400–U+04FF */ @@ -110,6 +112,8 @@ static const scriptRange scriptRanges[] = { { Script_Devanagari, 0x1cd0, 0x1cff, Script_Devanagari_Numeric, 0}, /* Phonetic Extensions: U+1D00–U+1DBF */ { Script_Latin, 0x1d00, 0x1dbf, 0, 0}, + /* Combining Diacritical Marks Supplement: U+1DC0–U+1DFF */ + { Script_Diacritical,0x1dc0, 0x1dff, 0, 0}, /* Latin Extended Additional: U+1E00–U+1EFF */ { Script_Latin, 0x1e00, 0x1eff, 0, 0}, /* Greek Extended: U+1F00–U+1FFF */ @@ -354,6 +358,10 @@ static const scriptData scriptInformation[] = { {LANG_MALAYALAM, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','l','y','m'), {'K','a','r','t','i','k','a',0}}, + {{Script_Diacritical, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_ENGLISH, 0, 1, 0, 1, ANSI_CHARSET, 0, 0, 0, 0, 0, 1, 1, 0, 0}, + 0x00000000, + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -379,7 +387,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[36].props, &scriptInformation[37].props, &scriptInformation[38].props, &scriptInformation[39].props, &scriptInformation[40].props, &scriptInformation[41].props, - &scriptInformation[42].props, &scriptInformation[43].props + &scriptInformation[42].props, &scriptInformation[43].props, + &scriptInformation[44].props }; typedef struct { @@ -870,6 +879,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int Right-to-Left Mark U+200F) will force us into bidi mode */ if (!forceLevels && pwcInChars[i] >= 0x200B && pwcInChars[i] <= 0x200F) forceLevels = TRUE; + + /* Diacritical marks merge with other scripts */ + if (scripts[i] == Script_Diacritical && i > 0) + scripts[i] = scripts[i-1]; } for (i = 0; i < cInChars; i++) @@ -927,6 +940,14 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); + /* We currently mis-level leading Diacriticals */ + if (scripts[0] == Script_Diacritical) + for (i = 0; i < cInChars && scripts[0] == Script_Diacritical; i++) + { + levels[i] = odd(levels[i])?levels[i]+1:levels[i]; + strength[i] = BIDI_STRONG; + } + for (i = 0; i < cInChars; i++) { /* Script_Numeric and select puncuation at level 0 get bumped to level 2 */ diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 9f13b40..d6c910f 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -71,6 +71,8 @@ #define Script_Kannada_Numeric 41 #define Script_Malayalam 42 #define Script_Malayalam_Numeric 43 +/* More supplemental */ +#define Script_Diacritical 44 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

André Hentschel : winemaker: Respect more spaces when splitting the options.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: b40c5f2d2c20a9037a002e1a404e278b56df67f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b40c5f2d2c20a9037a002e1a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 19 19:41:38 2011 +0100 winemaker: Respect more spaces when splitting the options. --- tools/winemaker | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 2ee79ea..64e92bd 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -604,7 +604,7 @@ sub source_scan_project_file($$$) next; } elsif (/^# ADD CPP(.*)/ && $found_cfg==1) { $prj_target_cflags=$1; - @prj_target_options=split(" /", $prj_target_cflags); + @prj_target_options=split(/\s+\//, $prj_target_cflags); $prj_target_cflags=""; foreach ( @prj_target_options ) { if ($_ eq "") { @@ -736,7 +736,7 @@ sub source_scan_project_file($$$) next; } elsif (/^# ADD LINK32(.*)/ && $found_cfg==1) { $prj_target_ldflags=$1; - @prj_target_options=split(" /", $prj_target_ldflags); + @prj_target_options=split(/\s+\//, $prj_target_ldflags); $prj_target_ldflags=""; $prj_target_libs=$prj_target_options[0]; $prj_target_libs=~s/\\/\//g;

1 0

André Hentschel : winemaker: Remove some unused variables.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 289ca97930444fbdf93b339dde090534d3f4818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=289ca97930444fbdf93b339dd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 19 19:41:51 2011 +0100 winemaker: Remove some unused variables. --- tools/winemaker | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 64e92bd..1e39adb 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1001,10 +1001,6 @@ sub source_scan_project_file($$$) } } - my @local_dlls=(); - my @local_depends=(); - my @exe_list=(); - # Create the target... my $target=[]; target_init($target); @@ -1012,13 +1008,10 @@ sub source_scan_project_file($$$) if ($prj_target_type!=$TT_DLL) { $prj_name=lc($prj_name.".exe"); @$target[$T_TYPE]=$opt_target_type; - push @exe_list,$target; push @{@$target[$T_LDFLAGS]},(@$target[$T_TYPE] == $TT_CUIEXE ? "-mconsole" : "-mwindows"); } else { $prj_name=lc($prj_name.".dll"); @$target[$T_TYPE]=$TT_DLL; - push @local_depends,"$prj_name.so"; - push @local_dlls,$prj_name; my $canon=canonize($prj_name); if (@$project_settings[$T_FLAGS] & $TF_HASDEF) { push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.def)");

1 0

André Hentschel : winemaker: Be less picky when detecting the target type.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 06f4928474891b30cf838c98681d3a37d00006fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f4928474891b30cf838c986… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 19 19:42:34 2011 +0100 winemaker: Be less picky when detecting the target type. --- tools/winemaker | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 1e39adb..e783ce7 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -589,16 +589,16 @@ sub source_scan_project_file($$$) #print $prj_name; next; } elsif (/^# TARGTYPE/) { - if (/[[:space:]]0x0101$/) { + if (/[[:space:]]0+x0*101$/) { # Application $prj_target_type=$TT_GUIEXE; - }elsif (/[[:space:]]0x0102$/) { + }elsif (/[[:space:]]0+x0*102$/) { # Dynamic-Link Library $prj_target_type=$TT_DLL; - }elsif (/[[:space:]]0x0103$/) { + }elsif (/[[:space:]]0+x0*103$/) { # Console Application $prj_target_type=$TT_CUIEXE; - }elsif (/[[:space:]]0x0104$/) { + }elsif (/[[:space:]]0+x0*104$/) { # Static Library } next;

1 0