Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SETUPAPI] Revert "Fix a typo in CM_Query_Resource_Conflict_List." (#1634)
by Serge Gautherie 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b13990bd789a6e2bc9b0f… commit b13990bd789a6e2bc9b0f9230cfeafefeba9c780 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jun 10 02:14:52 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 15 17:55:33 2019 +0200 [SETUPAPI] Revert "Fix a typo in CM_Query_Resource_Conflict_List." (#1634) Previous code was correct. This reverts commit c47ad98f. --- dll/win32/setupapi/cfgmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index d33a6497172..8215d47ac63 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -6761,7 +6761,7 @@ CM_Query_Resource_Conflict_List( if (lpDevInst == NULL) return CR_INVALID_DEVNODE; - pConflictData = MyMalloc(sizeof(PCONFLICT_DATA)); + pConflictData = MyMalloc(sizeof(CONFLICT_DATA)); if (pConflictData == NULL) { ret = CR_OUT_OF_MEMORY;

1 0

[reactos] 01/01: [LPK] Fix for CORE-16115. (#1654)
by Baruch Rutman 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22064d7787514c72ab5d3… commit 22064d7787514c72ab5d3db5da4d0929cab73b15 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Fri Jun 14 01:43:44 2019 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 15 17:37:51 2019 +0200 [LPK] Fix for CORE-16115. (#1654) Proposed changes: - Use the total extent (width) and font metrics (height) as values to put in the lpSize variable instead of calling ScriptString_pSize() in the LpkGetTextExtentExPoint() function. - Use GetTextExtentExPointWPri in more cases as another effort to get the data. - Trailing whitespace fixes. --- dll/win32/lpk/lpk.c | 117 +++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 60 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index f3ecaf9499b..b4291448bfe 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -57,12 +57,12 @@ static void PSM_PrepareToDraw(LPCWSTR str, INT count, LPWSTR new_str, LPINT new_ } } - new_str[j] = L'\0'; + new_str[j] = L'\0'; len = wcslen(new_str); *new_count = len; } -/* Can be used with also LpkDrawTextEx if it will be implemented */ +/* Can be used with also LpkDrawTextEx() if it will be implemented */ static void LPK_DrawUnderscore(HDC hdc, int x, int y, LPCWSTR str, int count, int offset) { SCRIPT_STRING_ANALYSIS ssa; @@ -82,7 +82,7 @@ static void LPK_DrawUnderscore(HDC hdc, int x, int y, LPCWSTR str, int count, in { if (GetLayout(hdc) & LAYOUT_RTL || GetTextAlign(hdc) & TA_RTLREADING) dwSSAFlags |= SSA_RTL; - + hr = ScriptStringAnalyse(hdc, str, count, (3 * count / 2 + 16), -1, dwSSAFlags, -1, NULL, NULL, NULL, NULL, NULL, &ssa); } @@ -110,16 +110,16 @@ static void LPK_DrawUnderscore(HDC hdc, int x, int y, LPCWSTR str, int count, in DeleteObject(hpen); } -/* Code taken from the GetProcessDefaultLayout function from Wine's user32 - * Wine version 3.17 - * - * This function should be called from LpkInitialize, - * which is in turn called by GdiInitializeLanguagePack (from gdi32). - * TODO: Move call from LpkDllInitialize to LpkInitialize when latter +/* Code taken from the GetProcessDefaultLayout() function from Wine's user32 + * Wine version 3.17 + * + * This function should be called from LpkInitialize(), + * which is in turn called by GdiInitializeLanguagePack() (from gdi32). + * TODO: Move call from LpkDllInitialize() to LpkInitialize() when latter * function is implemented. */ static void LPK_ApplyMirroring() -{ +{ static const WCHAR translationW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; static const WCHAR filedescW[] = { '\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', @@ -195,7 +195,7 @@ LpkDllInitialize( /* - * @implemented + * @implemented */ BOOL WINAPI @@ -232,15 +232,15 @@ LpkExtTextOut( if (ScriptIsComplex(lpString, uCount, dwSICFlags) == S_OK && !(fuOptions & ETO_GLYPH_INDEX)) { /* reordered_str is used as fallback in case the glyphs array fails to generate, - BIDI_Reorder doesn't attempt to write into reordered_str if memory allocation fails */ + BIDI_Reorder() doesn't attempt to write into reordered_str if memory allocation fails */ reordered_str = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WCHAR)); bReorder = BIDI_Reorder(hdc, lpString, uCount, GCP_REORDER, (fuOptions & ETO_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, reordered_str, uCount, NULL, &glyphs, &cGlyphs); - /* Now display the reordered text if any of the arrays is valid and if BIDI_Reorder succeeded */ - if ((glyphs || reordered_str) && bReorder) + /* Now display the reordered text if any of the arrays is valid and if BIDI_Reorder() succeeded */ + if ((glyphs || reordered_str) && bReorder) { if (glyphs) { @@ -372,19 +372,19 @@ LpkGetCharacterPlacement( return ret; } -/* Stripped down version of DrawText, can only draw single line text and Prefix underscore - * (only on the last found amperstand) - * only flags to be found to be of use in testing: - * +/* Stripped down version of DrawText(), can only draw single line text and Prefix underscore + * (only on the last found amperstand). + * Only flags to be found to be of use in testing: + * * DT_NOPREFIX - Draw the string as is without removal of the amperstands and without underscore * DT_HIDEPREFIX - Draw the string without underscore * DT_PREFIXONLY - Draw only the underscore - * - * without any of these flags the behavior is the string being drawn without the amperstands and + * + * Without any of these flags the behavior is the string being drawn without the amperstands and * with the underscore. - * user32 has an equivalent function - UserLpkPSMTextOut - * - * Note: lpString does not need to be null terminated + * user32 has an equivalent function - UserLpkPSMTextOut(). + * + * Note: lpString does not need to be null terminated. */ INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, DWORD dwFlags) { @@ -434,18 +434,18 @@ WINAPI LpkGetTextExtentExPoint( HDC hdc, LPCWSTR lpString, - INT cString, + INT cString, INT nMaxExtent, LPINT lpnFit, - LPINT lpnDx, + LPINT lpnDx, LPSIZE lpSize, DWORD dwUnused, int unknown) { SCRIPT_STRING_ANALYSIS ssa; HRESULT hr; - const SIZE *pSize; INT i, extent, *Dx; + TEXTMETRICW tm; UNREFERENCED_PARAMETER(dwUnused); UNREFERENCED_PARAMETER(unknown); @@ -453,7 +453,7 @@ LpkGetTextExtentExPoint( if (cString < 0 || !lpSize) return FALSE; - if (cString == 0) + if (cString == 0 || !lpString) { lpSize->cx = 0; lpSize->cy = 0; @@ -462,51 +462,48 @@ LpkGetTextExtentExPoint( /* Check if any processing is required */ if (ScriptIsComplex(lpString, cString, SIC_COMPLEX) != S_OK) - return GetTextExtentExPointWPri(hdc, lpString, cString, nMaxExtent, lpnFit, lpnDx, lpSize); - + goto fallback; + hr = ScriptStringAnalyse(hdc, lpString, cString, 3 * cString / 2 + 16, -1, SSA_GLYPHS, 0, NULL, NULL, NULL, NULL, NULL, &ssa); - if (hr != S_OK) - return FALSE; + goto fallback; - pSize = ScriptString_pSize(ssa); + /* Use logic from TextIntGetTextExtentPoint() */ + Dx = HeapAlloc(GetProcessHeap(), 0, cString * sizeof(INT)); + if (!Dx) + { + ScriptStringFree(&ssa); + goto fallback; + } - if (pSize) - *lpSize = *pSize; - else - GetTextExtentExPointWPri(hdc, lpString, cString, 0, NULL, NULL, lpSize); + if (lpnFit) + *lpnFit = 0; - /* Use logic from TextIntGetTextExtentPoint */ - if (lpnDx || lpnFit) - { - Dx = HeapAlloc(GetProcessHeap(), 0, cString * sizeof(INT)); + ScriptStringGetLogicalWidths(ssa, Dx); - if (!Dx) - { - ScriptStringFree(&ssa); - return FALSE; - } - - if (lpnFit) - *lpnFit = 0; + for (i = 0, extent = 0; i < cString; i++) + { + extent += Dx[i]; - ScriptStringGetLogicalWidths(ssa, Dx); + if (extent <= nMaxExtent && lpnFit) + *lpnFit = i + 1; - for (i = 0, extent = 0; i < cString; i++) - { - extent += Dx[i]; + if (lpnDx) + lpnDx[i] = extent; + } - if (extent <= nMaxExtent && lpnFit) - *lpnFit = i + 1; + HeapFree(GetProcessHeap(), 0, Dx); + ScriptStringFree(&ssa); - if (lpnDx) - lpnDx[i] = extent; - } + if (!GetTextMetricsW(hdc, &tm)) + return GetTextExtentExPointWPri(hdc, lpString, cString, 0, NULL, NULL, lpSize); - HeapFree(GetProcessHeap(), 0, Dx); - } + lpSize->cx = extent; + lpSize->cy = tm.tmHeight; - ScriptStringFree(&ssa); return TRUE; + +fallback: + return GetTextExtentExPointWPri(hdc, lpString, cString, nMaxExtent, lpnFit, lpnDx, lpSize); }

1 0

[reactos] 01/01: [LPK] Update Wine BiDi code. (#1651)
by Baruch Rutman 15 Jun '19

15 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a7ffd29d6a45749237e0… commit 1a7ffd29d6a45749237e090b24067623f1ca74cf Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Thu May 23 22:59:30 2019 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 15 17:24:38 2019 +0200 [LPK] Update Wine BiDi code. (#1651) Imports the changes from https://github.com/wine-mirror/wine/commit/ef07087f47177e847c249d44f3f4918d… --- dll/win32/lpk/CMakeLists.txt | 1 + dll/win32/lpk/bidi.c | 57 ++--- dll/win32/lpk/direction.c | 575 +++++++++++++++++++++++++++++++++++++++++++ media/doc/README.WINE | 5 +- 4 files changed, 598 insertions(+), 40 deletions(-) diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt index 5a21c6cdeed..25fd9339ea7 100644 --- a/dll/win32/lpk/CMakeLists.txt +++ b/dll/win32/lpk/CMakeLists.txt @@ -5,6 +5,7 @@ spec2def(lpk.dll lpk.spec ADD_IMPORTLIB) list(APPEND SOURCE bidi.c + direction.c lpk.c stub.c ros_lpk.h) diff --git a/dll/win32/lpk/bidi.c b/dll/win32/lpk/bidi.c index 1a38c595aa0..8e6d7da0644 100644 --- a/dll/win32/lpk/bidi.c +++ b/dll/win32/lpk/bidi.c @@ -43,8 +43,6 @@ */ #include "ros_lpk.h" -//#include "config.h" -//#include "gdi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); @@ -52,6 +50,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(bidi); #define odd(x) ((x) & 1) +extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; + /*------------------------------------------------------------------------ Bidirectional Character Types @@ -93,52 +93,29 @@ enum directions LRE, PDF, + LRI, /* Isolate formatting characters new with 6.3 */ + RLI, + FSI, + PDI, + /* resolved types, also resolved directions */ - N = ON, /* alias, where ON, WS and S are treated the same */ + NI = ON, /* alias, where ON, WS and S are treated the same */ }; /* HELPER FUNCTIONS */ +static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch) +{ + return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; +} + /* Convert the libwine information to the direction enum */ static void classify(LPCWSTR lpString, WORD *chartype, DWORD uCount) { - static const enum directions dir_map[16] = - { - L, /* unassigned defaults to L */ - L, - R, - EN, - ES, - ET, - AN, - CS, - B, - S, - WS, - ON, - AL, - NSM, - BN, - PDF /* also LRE, LRO, RLE, RLO */ - }; - unsigned i; for (i = 0; i < uCount; ++i) - { - chartype[i] = dir_map[get_char_typeW(lpString[i]) >> 12]; - if (chartype[i] == PDF) - { - switch (lpString[i]) - { - case 0x202A: chartype[i] = LRE; break; - case 0x202B: chartype[i] = RLE; break; - case 0x202C: chartype[i] = PDF; break; - case 0x202D: chartype[i] = LRO; break; - case 0x202E: chartype[i] = RLO; break; - } - } - } + chartype[i] = get_table_entry( bidi_direction_table, lpString[i] ); } /* Set a run of cval values at locations all prior to, but not including */ @@ -257,6 +234,10 @@ static void resolveWhitespace(int baselevel, const WORD *pcls, BYTE *plevel, int case LRO: case RLO: case PDF: + case LRI: + case RLI: + case FSI: + case PDI: case BN: plevel[ich] = oldlevel; cchrun++; @@ -510,7 +491,7 @@ BOOL BIDI_Reorder( case B: case S: case WS: - case ON: chartype[j] = N; + case ON: chartype[j] = NI; default: continue; } diff --git a/dll/win32/lpk/direction.c b/dll/win32/lpk/direction.c new file mode 100644 index 00000000000..6adbb73dfdd --- /dev/null +++ b/dll/win32/lpk/direction.c @@ -0,0 +1,575 @@ +/* Unicode BiDi direction table */ +/* Automatically generated; DO NOT EDIT!! */ + +#include "windef.h" + +const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +{ + /* level 1 offsets */ + 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, + 0x0180, 0x0190, 0x01a0, 0x01b0, 0x01c0, 0x01d0, 0x01e0, 0x01f0, + 0x0200, 0x0110, 0x0110, 0x0210, 0x0220, 0x0110, 0x0230, 0x0240, + 0x0250, 0x0260, 0x0270, 0x0280, 0x0290, 0x02a0, 0x0110, 0x02b0, + 0x02c0, 0x02d0, 0x02e0, 0x02f0, 0x0300, 0x0310, 0x0320, 0x0310, + 0x0110, 0x0310, 0x0310, 0x0330, 0x0340, 0x0350, 0x0360, 0x0370, + 0x0380, 0x0390, 0x03a0, 0x03b0, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x03c0, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x03d0, 0x0110, 0x03e0, 0x03f0, + 0x0400, 0x0410, 0x0420, 0x0430, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, + 0x0110, 0x0110, 0x0110, 0x0440, 0x0450, 0x0460, 0x0470, 0x0480, + /* level 2 offsets */ + 0x0490, 0x04a0, 0x04b0, 0x04c0, 0x04d0, 0x04e0, 0x04d0, 0x04f0, + 0x0500, 0x0510, 0x0520, 0x0530, 0x0540, 0x0550, 0x0540, 0x0550, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0560, 0x0570, 0x0570, 0x0580, 0x0590, + 0x05a0, 0x05a0, 0x05a0, 0x05a0, 0x05a0, 0x05a0, 0x05a0, 0x05b0, + 0x05c0, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x05d0, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x05e0, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x05f0, 0x0600, 0x05a0, 0x0610, 0x0620, 0x0630, 0x0640, 0x0650, + 0x0660, 0x0670, 0x0680, 0x0680, 0x0690, 0x05a0, 0x06a0, 0x06b0, + 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x06c0, 0x06d0, 0x06e0, + 0x06f0, 0x0700, 0x0680, 0x05a0, 0x0710, 0x0680, 0x0680, 0x0680, + 0x0680, 0x0680, 0x0720, 0x0730, 0x0630, 0x0630, 0x0740, 0x0750, + 0x0630, 0x0760, 0x0770, 0x0780, 0x0630, 0x0790, 0x07a0, 0x0540, + 0x0540, 0x0540, 0x0680, 0x07b0, 0x0540, 0x07c0, 0x07d0, 0x05a0, + 0x07e0, 0x0540, 0x0540, 0x07f0, 0x0800, 0x0810, 0x0820, 0x0540, + 0x0830, 0x0540, 0x0540, 0x0840, 0x0850, 0x0540, 0x0820, 0x0860, + 0x0870, 0x0540, 0x0540, 0x0840, 0x0880, 0x0830, 0x0540, 0x0890, + 0x0870, 0x0540, 0x0540, 0x0840, 0x08a0, 0x0540, 0x0820, 0x08b0, + 0x0830, 0x0540, 0x0540, 0x08c0, 0x0850, 0x08d0, 0x0820, 0x0540, + 0x08e0, 0x0540, 0x0540, 0x0540, 0x08f0, 0x0540, 0x0540, 0x0900, + 0x0910, 0x0540, 0x0540, 0x0920, 0x0930, 0x0940, 0x0820, 0x0950, + 0x0830, 0x0540, 0x0540, 0x0840, 0x0960, 0x0540, 0x0820, 0x0540, + 0x0970, 0x0540, 0x0540, 0x0980, 0x0850, 0x0540, 0x0820, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0990, 0x09a0, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x09b0, 0x09c0, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x09d0, 0x09e0, 0x0540, 0x0540, 0x0540, + 0x0540, 0x09f0, 0x0540, 0x0a00, 0x0540, 0x0540, 0x0540, 0x0a10, + 0x0a20, 0x0a30, 0x05a0, 0x0a40, 0x08d0, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0a50, 0x0a60, 0x0540, 0x0a70, 0x0a80, 0x0a90, + 0x0aa0, 0x0ab0, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0a50, 0x0540, 0x0540, + 0x0540, 0x0ac0, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x04d0, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0ad0, 0x0ae0, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0af0, 0x0540, 0x0af0, 0x0540, 0x0820, 0x0540, 0x0820, + 0x0540, 0x0540, 0x0540, 0x0b00, 0x0b10, 0x0b20, 0x0540, 0x0ac0, + 0x0b30, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0940, 0x0540, 0x0b40, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0b50, 0x0b60, 0x0b70, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0b80, 0x0590, 0x0590, + 0x0540, 0x0b90, 0x0540, 0x0540, 0x0540, 0x0ba0, 0x0bb0, 0x0bc0, + 0x0540, 0x0540, 0x0540, 0x0bd0, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0be0, 0x0540, 0x0540, 0x0bf0, 0x08e0, 0x0540, 0x0c00, 0x0be0, + 0x0970, 0x0540, 0x0c10, 0x0540, 0x0540, 0x0540, 0x0c20, 0x0970, + 0x0540, 0x0540, 0x0c30, 0x0c40, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0c50, 0x0c60, 0x0c70, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x05a0, 0x05a0, 0x05a0, 0x0c80, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0c90, 0x0ca0, 0x0cb0, 0x0cb0, 0x0cc0, + 0x0cd0, 0x0590, 0x0ce0, 0x0cf0, 0x0d00, 0x0d10, 0x0d20, 0x0d30, + 0x0d40, 0x0540, 0x0d50, 0x0d50, 0x0540, 0x05a0, 0x05a0, 0x0a80, + 0x0d60, 0x0d70, 0x0d80, 0x0d90, 0x0da0, 0x0590, 0x0540, 0x0540, + 0x0db0, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0dc0, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0590, 0x0590, 0x0dd0, 0x0540, 0x0540, 0x0540, 0x04e0, + 0x0590, 0x0de0, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0590, 0x0df0, 0x0540, 0x0e00, 0x0540, 0x0590, 0x0590, + 0x0e10, 0x0e20, 0x0540, 0x0540, 0x0540, 0x0540, 0x0e30, 0x0590, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0590, 0x0e40, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0e50, + 0x0590, 0x0e60, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0e70, 0x0e80, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0e90, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x05a0, 0x05a0, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0540, 0x0540, 0x0540, + 0x0590, 0x0ea0, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0eb0, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0590, 0x0590, 0x0590, 0x0590, 0x0590, 0x0dd0, 0x0540, 0x0ec0, + 0x0ed0, 0x0590, 0x0ee0, 0x0ef0, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0f00, 0x04d0, 0x0540, 0x0540, 0x0540, 0x0540, 0x0f10, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0590, 0x0590, 0x0eb0, 0x0540, + 0x0540, 0x0cc0, 0x0540, 0x0540, 0x0540, 0x0590, 0x0540, 0x0f20, + 0x0540, 0x0540, 0x0540, 0x0f30, 0x0f40, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0f50, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0b80, 0x0540, 0x0f60, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0590, 0x0590, 0x0590, 0x0590, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0590, 0x0590, 0x0590, 0x0df0, 0x0540, 0x0540, 0x0540, + 0x0cb0, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0e90, 0x0f70, + 0x0540, 0x0920, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0970, + 0x0590, 0x0590, 0x0f80, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0f90, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0fa0, 0x0540, 0x0fb0, 0x0fc0, 0x0540, 0x0540, 0x0540, 0x0fd0, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0fe0, 0x0540, 0x05a0, 0x0ff0, + 0x0540, 0x0540, 0x1000, 0x0540, 0x1010, 0x0970, 0x0540, 0x0540, + 0x07e0, 0x0540, 0x0540, 0x1020, 0x0540, 0x0540, 0x1030, 0x0540, + 0x0540, 0x0540, 0x1040, 0x1050, 0x1060, 0x0540, 0x0540, 0x0840, + 0x0540, 0x0540, 0x0540, 0x1070, 0x0830, 0x0540, 0x0960, 0x08d0, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x1080, 0x0540, + 0x0540, 0x1090, 0x10a0, 0x10b0, 0x10c0, 0x0680, 0x0680, 0x0680, + 0x0680, 0x0680, 0x0680, 0x0680, 0x10d0, 0x10e0, 0x0680, 0x0680, + 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, + 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, + 0x0680, 0x0680, 0x0680, 0x10f0, 0x0540, 0x0680, 0x0680, 0x0680, + 0x0680, 0x1100, 0x0680, 0x0680, 0x1110, 0x0540, 0x0540, 0x1120, + 0x05a0, 0x0ac0, 0x05a0, 0x0590, 0x0590, 0x1130, 0x1140, 0x1150, + 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x0680, 0x1160, + 0x1170, 0x04c0, 0x04d0, 0x04e0, 0x04d0, 0x04e0, 0x0dd0, 0x0540, + 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, 0x1180, 0x1190, + /* values */ + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000b, 0x000d, 0x000b, 0x000c, 0x000d, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000d, 0x000d, 0x000d, 0x000b, + 0x000c, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0008, 0x0007, 0x0008, 0x0007, 0x0007, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000d, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x0007, 0x0000, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x000a, 0x0000, 0x0000, + 0x0009, 0x0009, 0x0004, 0x0004, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0004, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0009, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, + 0x0002, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0002, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0000, 0x0000, + 0x0005, 0x0009, 0x0009, 0x0005, 0x0007, 0x0005, 0x0000, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, + 0x0003, 0x0003, 0x0009, 0x0003, 0x0003, 0x0005, 0x0005, 0x0005, + 0x0006, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0003, 0x0000, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0005, 0x0005, 0x0006, + 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0005, 0x0005, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, + 0x0005, 0x0006, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0002, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0002, 0x0001, 0x0001, 0x0006, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0002, 0x0006, 0x0006, 0x0006, + 0x0002, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0002, 0x0001, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0003, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0009, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0009, 0x0001, 0x0001, 0x0006, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0009, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, + 0x0001, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x000c, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0009, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0006, 0x0006, 0x0006, 0x000a, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0006, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, + 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, + 0x000c, 0x000c, 0x000c, 0x000a, 0x000a, 0x000a, 0x0001, 0x0002, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x000c, 0x000d, 0x0011, 0x000f, 0x0012, 0x0010, 0x000e, 0x0007, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000c, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0001, 0x0013, 0x0014, + 0x0015, 0x0016, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, + 0x0004, 0x0001, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, + 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, 0x0009, + 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0009, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0008, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, + 0x0004, 0x0004, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x000c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, + 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0009, 0x0009, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, 0x0006, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, 0x0001, + 0x0006, 0x0001, 0x0006, 0x0006, 0x0006, 0x0001, 0x0001, 0x0006, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0006, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0006, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0006, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0008, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0002, 0x0001, + 0x0002, 0x0002, 0x0001, 0x0002, 0x0002, 0x0001, 0x0002, 0x0002, + 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, + 0x0005, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0000, 0x0001, 0x0001, + 0x0007, 0x0000, 0x0007, 0x0001, 0x0000, 0x0007, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, + 0x0000, 0x0000, 0x0008, 0x0008, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0000, 0x0009, 0x0009, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, + 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0001, 0x0001, 0x000a, + 0x0001, 0x0000, 0x0000, 0x0009, 0x0009, 0x0009, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0008, 0x0007, 0x0008, 0x0007, 0x0007, + 0x0009, 0x0009, 0x0000, 0x0000, 0x0000, 0x0009, 0x0009, 0x0001, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001 +}; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f0d7244ca11..0274793364e 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -289,8 +289,9 @@ kernel32 - reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-3.3 lpk - - reactos/dll/win32/lpk/bidi.c # Synced to WineStaging-3.7 - + reactos/dll/win32/lpk/bidi.c # Synced to Wine-4.9 (gdi32/bidi.c) + reactos/dll/win32/lpk/direction.c # Synced to Wine-4.9 (gdi32/direction.c) + msvcrt - reactos/sdk/lib/crt/conio/cputs.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/except/cpp.c # Synced at 20080528

1 0

[reactos] 01/01: [MSI] Fix regression CORE-14646
by Joachim Henze 14 Jun '19

14 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10f00f8c1c844480146a2… commit 10f00f8c1c844480146a251bff9c19f8ed3279a7 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Jun 14 23:21:37 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Jun 14 23:21:37 2019 +0200 [MSI] Fix regression CORE-14646 Pressing Next-button in setup of "1C Enterprise (training version) 8.3.10.2252" did not have any effect anymore. Setup could not be completed anymore. The regression was introduced to ros by 0.4.8-dev-739-g f8b992f2d31aaea06dd6a360ad19165d56c331dc and was confirmed being a Wine-regression in https://bugs.winehq.org/show_bug.cgi?id=45445 Thanks to Fabian Maurer for communicating to Wine and thanks to Thomas Faber for regenerating cond.tab.c from the fixed source file cond.y using BISON. I also committed the same fix to 0.4.12-RC-32-g152ee20. --- dll/win32/msi/cond.tab.c | 245 +++++++++++++++++++++++++---------------------- dll/win32/msi/cond.y | 2 +- 2 files changed, 133 insertions(+), 114 deletions(-) diff --git a/dll/win32/msi/cond.tab.c b/dll/win32/msi/cond.tab.c index 65c56bdc763..2ea550c96a8 100644 --- a/dll/win32/msi/cond.tab.c +++ b/dll/win32/msi/cond.tab.c @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.0. */ +/* A Bison parser, made by GNU Bison 3.1. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0" +#define YYBISON_VERSION "3.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -186,11 +186,11 @@ static void value_free( struct value val ) #line 188 "cond.tab.c" /* yacc.c:339 */ -# ifndef YY_NULL +# ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr +# define YY_NULLPTR nullptr # else -# define YY_NULL 0 +# define YY_NULLPTR 0 # endif # endif @@ -202,10 +202,7 @@ static void value_free( struct value val ) # define YYERROR_VERBOSE 0 #endif -/* In a future release of Bison, this section will be replaced - by #include "cond.tab.h". */ -#ifndef YY_COND_E_REACTOSSYNC_GCC_DLL_WIN32_MSI_COND_TAB_H_INCLUDED -# define YY_COND_E_REACTOSSYNC_GCC_DLL_WIN32_MSI_COND_TAB_H_INCLUDED + /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -262,7 +259,7 @@ extern int cond_debug; /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE YYSTYPE; + union YYSTYPE { #line 122 "cond.y" /* yacc.c:355 */ @@ -273,8 +270,10 @@ union YYSTYPE INT operator; BOOL bool; -#line 277 "cond.tab.c" /* yacc.c:355 */ +#line 274 "cond.tab.c" /* yacc.c:355 */ }; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 #endif @@ -283,11 +282,11 @@ union YYSTYPE int cond_parse (COND_input *info); -#endif /* !YY_COND_E_REACTOSSYNC_GCC_DLL_WIN32_MSI_COND_TAB_H_INCLUDED */ + /* Copy the second part of user declarations. */ -#line 291 "cond.tab.c" /* yacc.c:358 */ +#line 290 "cond.tab.c" /* yacc.c:358 */ #ifdef short # undef short @@ -308,13 +307,13 @@ typedef signed char yytype_int8; #ifdef YYTYPE_UINT16 typedef YYTYPE_UINT16 yytype_uint16; #else -typedef unsigned short int yytype_uint16; +typedef unsigned short yytype_uint16; #endif #ifdef YYTYPE_INT16 typedef YYTYPE_INT16 yytype_int16; #else -typedef short int yytype_int16; +typedef short yytype_int16; #endif #ifndef YYSIZE_T @@ -326,7 +325,7 @@ typedef short int yytype_int16; # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif @@ -344,11 +343,30 @@ typedef short int yytype_int16; # endif #endif -#ifndef __attribute__ -/* This feature is available in gcc versions 2.5 and later. */ -# if (! defined __GNUC__ || __GNUC__ < 2 \ - || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) -# define __attribute__(Spec) /* empty */ +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) # endif #endif @@ -359,7 +377,7 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ @@ -527,7 +545,7 @@ union yyalloc #define YYMAXUTOK 295 #define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM as returned by yylex, without out-of-bounds checking. */ @@ -591,7 +609,7 @@ static const char *const yytname[] = "COND_QUESTION", "COND_AMPER", "COND_EXCLAM", "COND_IDENT", "COND_NUMBER", "COND_LITER", "COND_ERROR", "$accept", "condition", "expression", "boolean_term", "boolean_factor", "operator", "value", - "identifier", YY_NULL + "identifier", YY_NULLPTR }; #endif @@ -845,7 +863,7 @@ do { \ static void yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, COND_input *info) { - unsigned long int yylno = yyrline[yyrule]; + unsigned long yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", @@ -994,11 +1012,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = YY_NULL; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1055,7 +1073,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, } yyarg[yycount++] = yytname[yyx]; { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) return 2; @@ -1071,6 +1089,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, case N: \ yyformat = S; \ break + default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); @@ -1281,7 +1300,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) YYABORT; @@ -1392,89 +1411,89 @@ yyreduce: switch (yyn) { case 2: -#line 150 "cond.y" /* yacc.c:1646 */ +#line 150 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; cond->result = (yyvsp[0].bool); } -#line 1401 "cond.tab.c" /* yacc.c:1646 */ +#line 1420 "cond.tab.c" /* yacc.c:1651 */ break; case 3: -#line 155 "cond.y" /* yacc.c:1646 */ +#line 155 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; cond->result = MSICONDITION_NONE; } -#line 1410 "cond.tab.c" /* yacc.c:1646 */ +#line 1429 "cond.tab.c" /* yacc.c:1651 */ break; case 4: -#line 163 "cond.y" /* yacc.c:1646 */ +#line 163 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = (yyvsp[0].bool); } -#line 1418 "cond.tab.c" /* yacc.c:1646 */ +#line 1437 "cond.tab.c" /* yacc.c:1651 */ break; case 5: -#line 167 "cond.y" /* yacc.c:1646 */ +#line 167 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = (yyvsp[-2].bool) || (yyvsp[0].bool); } -#line 1426 "cond.tab.c" /* yacc.c:1646 */ +#line 1445 "cond.tab.c" /* yacc.c:1651 */ break; case 6: -#line 171 "cond.y" /* yacc.c:1646 */ +#line 171 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = !(yyvsp[-2].bool) || (yyvsp[0].bool); } -#line 1434 "cond.tab.c" /* yacc.c:1646 */ +#line 1453 "cond.tab.c" /* yacc.c:1651 */ break; case 7: -#line 175 "cond.y" /* yacc.c:1646 */ +#line 175 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = ( (yyvsp[-2].bool) || (yyvsp[0].bool) ) && !( (yyvsp[-2].bool) && (yyvsp[0].bool) ); } -#line 1442 "cond.tab.c" /* yacc.c:1646 */ +#line 1461 "cond.tab.c" /* yacc.c:1651 */ break; case 8: -#line 179 "cond.y" /* yacc.c:1646 */ +#line 179 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = ( (yyvsp[-2].bool) && (yyvsp[0].bool) ) || ( !(yyvsp[-2].bool) && !(yyvsp[0].bool) ); } -#line 1450 "cond.tab.c" /* yacc.c:1646 */ +#line 1469 "cond.tab.c" /* yacc.c:1651 */ break; case 9: -#line 186 "cond.y" /* yacc.c:1646 */ +#line 186 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = (yyvsp[0].bool); } -#line 1458 "cond.tab.c" /* yacc.c:1646 */ +#line 1477 "cond.tab.c" /* yacc.c:1651 */ break; case 10: -#line 190 "cond.y" /* yacc.c:1646 */ +#line 190 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = (yyvsp[-2].bool) && (yyvsp[0].bool); } -#line 1466 "cond.tab.c" /* yacc.c:1646 */ +#line 1485 "cond.tab.c" /* yacc.c:1651 */ break; case 11: -#line 197 "cond.y" /* yacc.c:1646 */ +#line 197 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = !(yyvsp[0].bool); } -#line 1474 "cond.tab.c" /* yacc.c:1646 */ +#line 1493 "cond.tab.c" /* yacc.c:1651 */ break; case 12: -#line 201 "cond.y" /* yacc.c:1646 */ +#line 201 "cond.y" /* yacc.c:1651 */ { if ((yyvsp[0].value).type == VALUE_INTEGER) (yyval.bool) = (yyvsp[0].value).u.integer ? 1 : 0; @@ -1482,11 +1501,11 @@ yyreduce: (yyval.bool) = (yyvsp[0].value).u.string && (yyvsp[0].value).u.string[0]; value_free( (yyvsp[0].value) ); } -#line 1486 "cond.tab.c" /* yacc.c:1646 */ +#line 1505 "cond.tab.c" /* yacc.c:1651 */ break; case 13: -#line 209 "cond.y" /* yacc.c:1646 */ +#line 209 "cond.y" /* yacc.c:1651 */ { if ((yyvsp[-2].value).type == VALUE_INTEGER && (yyvsp[0].value).type == VALUE_INTEGER) { @@ -1499,7 +1518,7 @@ yyreduce: } else if ((yyvsp[-2].value).type == VALUE_LITERAL || (yyvsp[0].value).type == VALUE_LITERAL) { - (yyval.bool) = FALSE; + (yyval.bool) = ((yyvsp[-1].operator) == COND_NE || (yyvsp[-1].operator) == COND_INE ); } else if ((yyvsp[-2].value).type == VALUE_SYMBOL) /* symbol operator integer */ { @@ -1521,127 +1540,127 @@ yyreduce: value_free( (yyvsp[-2].value) ); value_free( (yyvsp[0].value) ); } -#line 1525 "cond.tab.c" /* yacc.c:1646 */ +#line 1544 "cond.tab.c" /* yacc.c:1651 */ break; case 14: -#line 244 "cond.y" /* yacc.c:1646 */ +#line 244 "cond.y" /* yacc.c:1651 */ { (yyval.bool) = (yyvsp[-1].bool); } -#line 1533 "cond.tab.c" /* yacc.c:1646 */ +#line 1552 "cond.tab.c" /* yacc.c:1651 */ break; case 15: -#line 251 "cond.y" /* yacc.c:1646 */ +#line 251 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_EQ; } -#line 1539 "cond.tab.c" /* yacc.c:1646 */ +#line 1558 "cond.tab.c" /* yacc.c:1651 */ break; case 16: -#line 252 "cond.y" /* yacc.c:1646 */ +#line 252 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_NE; } -#line 1545 "cond.tab.c" /* yacc.c:1646 */ +#line 1564 "cond.tab.c" /* yacc.c:1651 */ break; case 17: -#line 253 "cond.y" /* yacc.c:1646 */ +#line 253 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_LT; } -#line 1551 "cond.tab.c" /* yacc.c:1646 */ +#line 1570 "cond.tab.c" /* yacc.c:1651 */ break; case 18: -#line 254 "cond.y" /* yacc.c:1646 */ +#line 254 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_GT; } -#line 1557 "cond.tab.c" /* yacc.c:1646 */ +#line 1576 "cond.tab.c" /* yacc.c:1651 */ break; case 19: -#line 255 "cond.y" /* yacc.c:1646 */ +#line 255 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_LE; } -#line 1563 "cond.tab.c" /* yacc.c:1646 */ +#line 1582 "cond.tab.c" /* yacc.c:1651 */ break; case 20: -#line 256 "cond.y" /* yacc.c:1646 */ +#line 256 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_GE; } -#line 1569 "cond.tab.c" /* yacc.c:1646 */ +#line 1588 "cond.tab.c" /* yacc.c:1651 */ break; case 21: -#line 257 "cond.y" /* yacc.c:1646 */ +#line 257 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_SS; } -#line 1575 "cond.tab.c" /* yacc.c:1646 */ +#line 1594 "cond.tab.c" /* yacc.c:1651 */ break; case 22: -#line 258 "cond.y" /* yacc.c:1646 */ +#line 258 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_IEQ; } -#line 1581 "cond.tab.c" /* yacc.c:1646 */ +#line 1600 "cond.tab.c" /* yacc.c:1651 */ break; case 23: -#line 259 "cond.y" /* yacc.c:1646 */ +#line 259 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_INE; } -#line 1587 "cond.tab.c" /* yacc.c:1646 */ +#line 1606 "cond.tab.c" /* yacc.c:1651 */ break; case 24: -#line 260 "cond.y" /* yacc.c:1646 */ +#line 260 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_ILT; } -#line 1593 "cond.tab.c" /* yacc.c:1646 */ +#line 1612 "cond.tab.c" /* yacc.c:1651 */ break; case 25: -#line 261 "cond.y" /* yacc.c:1646 */ +#line 261 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_IGT; } -#line 1599 "cond.tab.c" /* yacc.c:1646 */ +#line 1618 "cond.tab.c" /* yacc.c:1651 */ break; case 26: -#line 262 "cond.y" /* yacc.c:1646 */ +#line 262 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_ILE; } -#line 1605 "cond.tab.c" /* yacc.c:1646 */ +#line 1624 "cond.tab.c" /* yacc.c:1651 */ break; case 27: -#line 263 "cond.y" /* yacc.c:1646 */ +#line 263 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_IGE; } -#line 1611 "cond.tab.c" /* yacc.c:1646 */ +#line 1630 "cond.tab.c" /* yacc.c:1651 */ break; case 28: -#line 264 "cond.y" /* yacc.c:1646 */ +#line 264 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_ISS; } -#line 1617 "cond.tab.c" /* yacc.c:1646 */ +#line 1636 "cond.tab.c" /* yacc.c:1651 */ break; case 29: -#line 265 "cond.y" /* yacc.c:1646 */ +#line 265 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_LHS; } -#line 1623 "cond.tab.c" /* yacc.c:1646 */ +#line 1642 "cond.tab.c" /* yacc.c:1651 */ break; case 30: -#line 266 "cond.y" /* yacc.c:1646 */ +#line 266 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_RHS; } -#line 1629 "cond.tab.c" /* yacc.c:1646 */ +#line 1648 "cond.tab.c" /* yacc.c:1651 */ break; case 31: -#line 267 "cond.y" /* yacc.c:1646 */ +#line 267 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_ILHS; } -#line 1635 "cond.tab.c" /* yacc.c:1646 */ +#line 1654 "cond.tab.c" /* yacc.c:1651 */ break; case 32: -#line 268 "cond.y" /* yacc.c:1646 */ +#line 268 "cond.y" /* yacc.c:1651 */ { (yyval.operator) = COND_IRHS; } -#line 1641 "cond.tab.c" /* yacc.c:1646 */ +#line 1660 "cond.tab.c" /* yacc.c:1651 */ break; case 33: -#line 273 "cond.y" /* yacc.c:1646 */ +#line 273 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; UINT len; @@ -1655,11 +1674,11 @@ yyreduce: } cond_free( (yyvsp[0].identifier) ); } -#line 1659 "cond.tab.c" /* yacc.c:1646 */ +#line 1678 "cond.tab.c" /* yacc.c:1651 */ break; case 34: -#line 287 "cond.y" /* yacc.c:1646 */ +#line 287 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; UINT len = GetEnvironmentVariableW( (yyvsp[0].identifier), NULL, 0 ); @@ -1674,11 +1693,11 @@ yyreduce: } cond_free( (yyvsp[0].identifier) ); } -#line 1678 "cond.tab.c" /* yacc.c:1646 */ +#line 1697 "cond.tab.c" /* yacc.c:1651 */ break; case 35: -#line 302 "cond.y" /* yacc.c:1646 */ +#line 302 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; (yyval.value).type = VALUE_LITERAL; @@ -1686,11 +1705,11 @@ yyreduce: if( !(yyval.value).u.string ) YYABORT; } -#line 1690 "cond.tab.c" /* yacc.c:1646 */ +#line 1709 "cond.tab.c" /* yacc.c:1651 */ break; case 36: -#line 310 "cond.y" /* yacc.c:1646 */ +#line 310 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; LPWSTR szNum = COND_GetString( cond, &(yyvsp[0].str) ); @@ -1700,11 +1719,11 @@ yyreduce: (yyval.value).u.integer = atoiW( szNum ); cond_free( szNum ); } -#line 1704 "cond.tab.c" /* yacc.c:1646 */ +#line 1723 "cond.tab.c" /* yacc.c:1651 */ break; case 37: -#line 320 "cond.y" /* yacc.c:1646 */ +#line 320 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; @@ -1721,11 +1740,11 @@ yyreduce: } cond_free( (yyvsp[0].identifier) ); } -#line 1725 "cond.tab.c" /* yacc.c:1646 */ +#line 1744 "cond.tab.c" /* yacc.c:1651 */ break; case 38: -#line 337 "cond.y" /* yacc.c:1646 */ +#line 337 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; @@ -1742,11 +1761,11 @@ yyreduce: } cond_free( (yyvsp[0].identifier) ); } -#line 1746 "cond.tab.c" /* yacc.c:1646 */ +#line 1765 "cond.tab.c" /* yacc.c:1651 */ break; case 39: -#line 354 "cond.y" /* yacc.c:1646 */ +#line 354 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; INSTALLSTATE install, action; @@ -1763,11 +1782,11 @@ yyreduce: } cond_free( (yyvsp[0].identifier) ); } -#line 1767 "cond.tab.c" /* yacc.c:1646 */ +#line 1786 "cond.tab.c" /* yacc.c:1651 */ break; case 40: -#line 371 "cond.y" /* yacc.c:1646 */ +#line 371 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN; @@ -1784,22 +1803,22 @@ yyreduce: } cond_free( (yyvsp[0].identifier) ); } -#line 1788 "cond.tab.c" /* yacc.c:1646 */ +#line 1807 "cond.tab.c" /* yacc.c:1651 */ break; case 41: -#line 391 "cond.y" /* yacc.c:1646 */ +#line 391 "cond.y" /* yacc.c:1651 */ { COND_input* cond = (COND_input*) info; (yyval.identifier) = COND_GetString( cond, &(yyvsp[0].str) ); if( !(yyval.identifier) ) YYABORT; } -#line 1799 "cond.tab.c" /* yacc.c:1646 */ +#line 1818 "cond.tab.c" /* yacc.c:1651 */ break; -#line 1803 "cond.tab.c" /* yacc.c:1646 */ +#line 1822 "cond.tab.c" /* yacc.c:1651 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2027,7 +2046,7 @@ yyreturn: #endif return yyresult; } -#line 399 "cond.y" /* yacc.c:1906 */ +#line 399 "cond.y" /* yacc.c:1910 */ diff --git a/dll/win32/msi/cond.y b/dll/win32/msi/cond.y index 6ee6ab979cc..3a0d02879a8 100644 --- a/dll/win32/msi/cond.y +++ b/dll/win32/msi/cond.y @@ -218,7 +218,7 @@ boolean_factor: } else if ($1.type == VALUE_LITERAL || $3.type == VALUE_LITERAL) { - $$ = FALSE; + $$ = ($2 == COND_NE || $2 == COND_INE ); } else if ($1.type == VALUE_SYMBOL) /* symbol operator integer */ {

1 0

[reactos] 01/01: [MSTSC] Center window at start
by Yaroslav Kibysh 14 Jun '19

14 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec14975612bf2414f09b8… commit ec14975612bf2414f09b86f2c05d3eabe7c6ae0f Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Mon Jun 10 11:36:59 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Jun 14 19:12:40 2019 +0300 [MSTSC] Center window at start --- base/applications/mstsc/lang/bg-BG.rc | 2 +- base/applications/mstsc/lang/ca-ES.rc | 2 +- base/applications/mstsc/lang/cs-CZ.rc | 2 +- base/applications/mstsc/lang/de-DE.rc | 2 +- base/applications/mstsc/lang/el-GR.rc | 2 +- base/applications/mstsc/lang/en-US.rc | 2 +- base/applications/mstsc/lang/es-ES.rc | 2 +- base/applications/mstsc/lang/fr-FR.rc | 2 +- base/applications/mstsc/lang/he-IL.rc | 2 +- base/applications/mstsc/lang/it-IT.rc | 2 +- base/applications/mstsc/lang/ja-JP.rc | 2 +- base/applications/mstsc/lang/ko-KR.rc | 2 +- base/applications/mstsc/lang/lt-LT.rc | 2 +- base/applications/mstsc/lang/no-NO.rc | 2 +- base/applications/mstsc/lang/pl-PL.rc | 2 +- base/applications/mstsc/lang/ro-RO.rc | 2 +- base/applications/mstsc/lang/ru-RU.rc | 2 +- base/applications/mstsc/lang/sk-SK.rc | 2 +- base/applications/mstsc/lang/sq-AL.rc | 2 +- base/applications/mstsc/lang/sv-SE.rc | 2 +- base/applications/mstsc/lang/tr-TR.rc | 2 +- base/applications/mstsc/lang/uk-UA.rc | 2 +- base/applications/mstsc/lang/zh-CN.rc | 2 +- base/applications/mstsc/lang/zh-TW.rc | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/base/applications/mstsc/lang/bg-BG.rc b/base/applications/mstsc/lang/bg-BG.rc index a5f0a1ba2c5..6ba664bb914 100644 --- a/base/applications/mstsc/lang/bg-BG.rc +++ b/base/applications/mstsc/lang/bg-BG.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Свързване с далечна работна площ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/ca-ES.rc b/base/applications/mstsc/lang/ca-ES.rc index 2d84b02f776..8182354d618 100644 --- a/base/applications/mstsc/lang/ca-ES.rc +++ b/base/applications/mstsc/lang/ca-ES.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Remote Desktop Connection" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/cs-CZ.rc b/base/applications/mstsc/lang/cs-CZ.rc index 30d3cf9ee27..55b4b15e5d3 100644 --- a/base/applications/mstsc/lang/cs-CZ.rc +++ b/base/applications/mstsc/lang/cs-CZ.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Připojení ke vzdálené ploše" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/de-DE.rc b/base/applications/mstsc/lang/de-DE.rc index 5cd697031ba..7c851f82184 100644 --- a/base/applications/mstsc/lang/de-DE.rc +++ b/base/applications/mstsc/lang/de-DE.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Remotedesktop-Verbindung" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/el-GR.rc b/base/applications/mstsc/lang/el-GR.rc index 6980b176936..3e535a24d56 100644 --- a/base/applications/mstsc/lang/el-GR.rc +++ b/base/applications/mstsc/lang/el-GR.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Σύνδεση απομακρυσμένης επιφάνειας εργασίας" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/en-US.rc b/base/applications/mstsc/lang/en-US.rc index 3b88ea16958..e714c360f17 100644 --- a/base/applications/mstsc/lang/en-US.rc +++ b/base/applications/mstsc/lang/en-US.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Remote Desktop Connection" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/es-ES.rc b/base/applications/mstsc/lang/es-ES.rc index a2669fdc27e..a325e0ffe00 100644 --- a/base/applications/mstsc/lang/es-ES.rc +++ b/base/applications/mstsc/lang/es-ES.rc @@ -40,7 +40,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Conexión a Escritorio remoto" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/fr-FR.rc b/base/applications/mstsc/lang/fr-FR.rc index 8183d87583a..1210df9f74d 100644 --- a/base/applications/mstsc/lang/fr-FR.rc +++ b/base/applications/mstsc/lang/fr-FR.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Connexion au bureau distant" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/he-IL.rc b/base/applications/mstsc/lang/he-IL.rc index 45aaad493ac..d1224c55349 100644 --- a/base/applications/mstsc/lang/he-IL.rc +++ b/base/applications/mstsc/lang/he-IL.rc @@ -40,7 +40,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL CAPTION "חיבור לשולחן עבודה מרוחק" FONT 8, "MS Shell Dlg", 400, 0, 0x1 diff --git a/base/applications/mstsc/lang/it-IT.rc b/base/applications/mstsc/lang/it-IT.rc index 9c2b9ad06a1..a8566b5e87e 100644 --- a/base/applications/mstsc/lang/it-IT.rc +++ b/base/applications/mstsc/lang/it-IT.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Connessione desktop remoto" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/ja-JP.rc b/base/applications/mstsc/lang/ja-JP.rc index 269f6000634..17839f0bda3 100644 --- a/base/applications/mstsc/lang/ja-JP.rc +++ b/base/applications/mstsc/lang/ja-JP.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "リモートデスクトップ接続" FONT 9, "MS UI Gothic", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/ko-KR.rc b/base/applications/mstsc/lang/ko-KR.rc index 8d6a8ccd830..4ef36267f4d 100644 --- a/base/applications/mstsc/lang/ko-KR.rc +++ b/base/applications/mstsc/lang/ko-KR.rc @@ -40,7 +40,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "원격 데스크탑 연결" FONT 9, "굴림", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/lt-LT.rc b/base/applications/mstsc/lang/lt-LT.rc index aad4681acc8..46f0911a3f1 100644 --- a/base/applications/mstsc/lang/lt-LT.rc +++ b/base/applications/mstsc/lang/lt-LT.rc @@ -40,7 +40,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Nutolusio darbalaukio prisijungimas" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/no-NO.rc b/base/applications/mstsc/lang/no-NO.rc index 66bc3e25481..584a64c3e64 100644 --- a/base/applications/mstsc/lang/no-NO.rc +++ b/base/applications/mstsc/lang/no-NO.rc @@ -38,7 +38,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Tilkobling til eksternt skrivebord" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/pl-PL.rc b/base/applications/mstsc/lang/pl-PL.rc index ba73efa01de..8dab92b1a7b 100644 --- a/base/applications/mstsc/lang/pl-PL.rc +++ b/base/applications/mstsc/lang/pl-PL.rc @@ -48,7 +48,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Połączenie pulpitu zdalnego" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/ro-RO.rc b/base/applications/mstsc/lang/ro-RO.rc index b93326c63c8..718f940c5c2 100644 --- a/base/applications/mstsc/lang/ro-RO.rc +++ b/base/applications/mstsc/lang/ro-RO.rc @@ -44,7 +44,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Conectare pentru control la distanță" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/ru-RU.rc b/base/applications/mstsc/lang/ru-RU.rc index bf1f2b71607..9ddd57a742e 100644 --- a/base/applications/mstsc/lang/ru-RU.rc +++ b/base/applications/mstsc/lang/ru-RU.rc @@ -40,7 +40,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 275 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Подключение к удаленному рабочему столу" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/sk-SK.rc b/base/applications/mstsc/lang/sk-SK.rc index 88afde4c877..5135ca518b0 100644 --- a/base/applications/mstsc/lang/sk-SK.rc +++ b/base/applications/mstsc/lang/sk-SK.rc @@ -42,7 +42,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Pripojenie vzdialenej pracovnej plochy" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/sq-AL.rc b/base/applications/mstsc/lang/sq-AL.rc index e8907317bc7..228c7dd4480 100644 --- a/base/applications/mstsc/lang/sq-AL.rc +++ b/base/applications/mstsc/lang/sq-AL.rc @@ -42,7 +42,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Lidhja e Desktopit të Larget" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/sv-SE.rc b/base/applications/mstsc/lang/sv-SE.rc index 7029a37c1f5..58b3b39baa4 100644 --- a/base/applications/mstsc/lang/sv-SE.rc +++ b/base/applications/mstsc/lang/sv-SE.rc @@ -45,7 +45,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Anslutning till fjärrskrivbord" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/tr-TR.rc b/base/applications/mstsc/lang/tr-TR.rc index 7bff025a76f..9538d4a1f99 100644 --- a/base/applications/mstsc/lang/tr-TR.rc +++ b/base/applications/mstsc/lang/tr-TR.rc @@ -40,7 +40,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Uzak Masaüstü Bağlantısı" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/uk-UA.rc b/base/applications/mstsc/lang/uk-UA.rc index 498507775c1..23ea46fa799 100644 --- a/base/applications/mstsc/lang/uk-UA.rc +++ b/base/applications/mstsc/lang/uk-UA.rc @@ -46,7 +46,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 267 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Підключення до віддаленого робочого столу" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/zh-CN.rc b/base/applications/mstsc/lang/zh-CN.rc index 0b3a0925ea7..1cb73d910a3 100644 --- a/base/applications/mstsc/lang/zh-CN.rc +++ b/base/applications/mstsc/lang/zh-CN.rc @@ -40,7 +40,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "远程桌面连接" FONT 9, "宋体", 400, 0, 0x1 BEGIN diff --git a/base/applications/mstsc/lang/zh-TW.rc b/base/applications/mstsc/lang/zh-TW.rc index af2f1529c7e..552517e5c89 100644 --- a/base/applications/mstsc/lang/zh-TW.rc +++ b/base/applications/mstsc/lang/zh-TW.rc @@ -45,7 +45,7 @@ BEGIN END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "遠端桌面連接" FONT 9, "新細明體", 400, 0, 0x1 BEGIN

1 0

[reactos] 01/01: [NETCFGX] InstallNetDevice: Run the default device installer before making class-specific changes.
by Eric Kohl 13 Jun '19

13 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b29f4d975a8bf5b196d9… commit 7b29f4d975a8bf5b196d9ca1903ca05829aa32bc Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jun 13 14:16:25 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jun 13 14:16:25 2019 +0200 [NETCFGX] InstallNetDevice: Run the default device installer before making class-specific changes. --- dll/win32/netcfgx/installer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dll/win32/netcfgx/installer.c b/dll/win32/netcfgx/installer.c index 995b85d6182..1607bb247bb 100644 --- a/dll/win32/netcfgx/installer.c +++ b/dll/win32/netcfgx/installer.c @@ -110,6 +110,14 @@ InstallNetDevice( DWORD dwShowIcon, dwLength, dwValue; WCHAR szBuffer[300]; + /* Install the adapter */ + if (!SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData)) + { + rc = GetLastError(); + ERR("SetupDiInstallDevice() failed (Error %lu)\n", rc); + goto cleanup; + } + /* Get Instance ID */ if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) { @@ -373,6 +381,7 @@ cleanup: RegCloseKey(hLinkageKey); if (hConnectionKey != NULL) RegCloseKey(hConnectionKey); + return rc; } @@ -558,8 +567,6 @@ cleanup: HeapFree(GetProcessHeap(), 0, BusType); HeapFree(GetProcessHeap(), 0, UuidString); - if (rc == ERROR_SUCCESS) - rc = ERROR_DI_DO_DEFAULT; TRACE("Returning 0x%lx\n", rc); return rc; }

1 0

[reactos] 01/01: [IPCONFIG] Indentation and coding style fixes. No code changes!
by Eric Kohl 13 Jun '19

13 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd579382b548d6d76406a… commit cd579382b548d6d76406a3e0a62ebcbc9ebdc1cd Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jun 13 02:35:16 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jun 13 02:35:53 2019 +0200 [IPCONFIG] Indentation and coding style fixes. No code changes! --- base/applications/network/ipconfig/ipconfig.c | 162 +++++++++++++------------- 1 file changed, 82 insertions(+), 80 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index fe5b7aced62..d85dd313cb8 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -30,23 +30,23 @@ HINSTANCE hInstance; HANDLE ProcessHeap; int LoadStringAndOem(HINSTANCE hInst, - UINT uID, - LPTSTR szNode, - int byteSize -) + UINT uID, + LPTSTR szNode, + int byteSize) { - TCHAR *szTmp; - int res; + TCHAR *szTmp; + int res; - szTmp = (LPTSTR)HeapAlloc(ProcessHeap, 0, byteSize); - if (szTmp == NULL) - { - return 0; - } - res = LoadString(hInst, uID, szTmp, byteSize); - CharToOem(szTmp, szNode); - HeapFree(ProcessHeap, 0, szTmp); - return res; + szTmp = (LPTSTR)HeapAlloc(ProcessHeap, 0, byteSize); + if (szTmp == NULL) + { + return 0; + } + + res = LoadString(hInst, uID, szTmp, byteSize); + CharToOem(szTmp, szNode); + HeapFree(ProcessHeap, 0, szTmp); + return res; } LPTSTR GetNodeTypeName(UINT NodeType) @@ -197,16 +197,16 @@ LPTSTR GetConnectionType(LPTSTR lpClass) KEY_READ, &hKey) == ERROR_SUCCESS) { - if(RegQueryValueEx(hKey, - _T("Name"), - NULL, - &dwType, - NULL, - &dwDataSize) == ERROR_SUCCESS) + if (RegQueryValueEx(hKey, + _T("Name"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) { ConTypeTmp = (LPTSTR)HeapAlloc(ProcessHeap, - 0, - dwDataSize); + 0, + dwDataSize); if (ConTypeTmp == NULL) return NULL; @@ -220,13 +220,13 @@ LPTSTR GetConnectionType(LPTSTR lpClass) HeapFree(ProcessHeap, 0, ConTypeTmp); return NULL; } - - if(RegQueryValueEx(hKey, - _T("Name"), - NULL, - &dwType, - (PBYTE)ConTypeTmp, - &dwDataSize) != ERROR_SUCCESS) + + if (RegQueryValueEx(hKey, + _T("Name"), + NULL, + &dwType, + (PBYTE)ConTypeTmp, + &dwDataSize) != ERROR_SUCCESS) { HeapFree(ProcessHeap, 0, @@ -235,7 +235,8 @@ LPTSTR GetConnectionType(LPTSTR lpClass) ConType = NULL; } - if (ConType) CharToOem(ConTypeTmp, ConType); + if (ConType) + CharToOem(ConTypeTmp, ConType); HeapFree(ProcessHeap, 0, ConTypeTmp); } } @@ -268,7 +269,7 @@ LPTSTR GetConnectionDescription(LPTSTR lpClass) return NULL; } - for (i=0; ; i++) + for (i = 0; ; i++) { DWORD PathSize; LONG Status; @@ -317,12 +318,12 @@ LPTSTR GetConnectionDescription(LPTSTR lpClass) HeapFree(ProcessHeap, 0, lpPath); lpPath = NULL; - if(RegQueryValueEx(hClassKey, - _T("NetCfgInstanceId"), - NULL, - &dwType, - NULL, - &dwDataSize) == ERROR_SUCCESS) + if (RegQueryValueEx(hClassKey, + _T("NetCfgInstanceId"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) { lpKeyClass = (LPTSTR)HeapAlloc(ProcessHeap, 0, @@ -330,12 +331,12 @@ LPTSTR GetConnectionDescription(LPTSTR lpClass) if (lpKeyClass == NULL) goto CLEANUP; - if(RegQueryValueEx(hClassKey, - _T("NetCfgInstanceId"), - NULL, - &dwType, - (PBYTE)lpKeyClass, - &dwDataSize) != ERROR_SUCCESS) + if (RegQueryValueEx(hClassKey, + _T("NetCfgInstanceId"), + NULL, + &dwType, + (PBYTE)lpKeyClass, + &dwDataSize) != ERROR_SUCCESS) { HeapFree(ProcessHeap, 0, lpKeyClass); lpKeyClass = NULL; @@ -350,12 +351,12 @@ LPTSTR GetConnectionDescription(LPTSTR lpClass) HeapFree(ProcessHeap, 0, lpKeyClass); lpKeyClass = NULL; - if(RegQueryValueEx(hClassKey, - _T("DriverDesc"), - NULL, - &dwType, - NULL, - &dwDataSize) == ERROR_SUCCESS) + if (RegQueryValueEx(hClassKey, + _T("DriverDesc"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) { lpConDesc = (LPTSTR)HeapAlloc(ProcessHeap, 0, @@ -363,12 +364,12 @@ LPTSTR GetConnectionDescription(LPTSTR lpClass) if (lpConDesc == NULL) goto CLEANUP; - if(RegQueryValueEx(hClassKey, - _T("DriverDesc"), - NULL, - &dwType, - (PBYTE)lpConDesc, - &dwDataSize) != ERROR_SUCCESS) + if (RegQueryValueEx(hClassKey, + _T("DriverDesc"), + NULL, + &dwType, + (PBYTE)lpConDesc, + &dwDataSize) != ERROR_SUCCESS) { HeapFree(ProcessHeap, 0, lpConDesc); lpConDesc = NULL; @@ -376,7 +377,9 @@ LPTSTR GetConnectionDescription(LPTSTR lpClass) } } else + { lpConDesc = NULL; + } break; } @@ -424,7 +427,7 @@ VOID ShowInfo(BOOL bAll) } else { - if( ERROR_NO_DATA != ret ) + if (ret != ERROR_NO_DATA) { DoFormatMessage(0); return; @@ -432,7 +435,7 @@ VOID ShowInfo(BOOL bAll) } /* call GetNetworkParams to obtain the network info */ - if(GetNetworkParams(pFixedInfo, &netOutBufLen) == ERROR_BUFFER_OVERFLOW) + if (GetNetworkParams(pFixedInfo, &netOutBufLen) == ERROR_BUFFER_OVERFLOW) { pFixedInfo = (FIXED_INFO *)HeapAlloc(ProcessHeap, 0, netOutBufLen); if (pFixedInfo == NULL) @@ -593,15 +596,15 @@ VOID Release(LPTSTR Index) { for (i = 0; i < pInfo->NumAdapters; i++) { - CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); - - /* Call IpReleaseAddress to release the IP address on the specified adapter. */ - if ((ret = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) - { - _tprintf(_T("\nAn error occured while releasing interface %ls : \n"), AdapterInfo.Name); - DoFormatMessage(ret); - } + CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); + _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); + + /* Call IpReleaseAddress to release the IP address on the specified adapter. */ + if ((ret = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) + { + _tprintf(_T("\nAn error occured while releasing interface %ls : \n"), AdapterInfo.Name); + DoFormatMessage(ret); + } } HeapFree(ProcessHeap, 0, pInfo); @@ -653,7 +656,7 @@ VOID Renew(LPTSTR Index) /* Make an initial call to GetInterfaceInfo to get * the necessary size into the ulOutBufLen variable */ - if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + if (GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) { HeapFree(ProcessHeap, 0, pInfo); pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); @@ -665,14 +668,13 @@ VOID Renew(LPTSTR Index) } /* Make a second call to GetInterfaceInfo to get the actual data we want */ - if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR ) + if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR) { for (i = 0; i < pInfo->NumAdapters; i++) { CopyMemory(&AdapterInfo, &pInfo->Adapter[i], sizeof(IP_ADAPTER_INDEX_MAP)); _tprintf(_T("name - %ls\n"), pInfo->Adapter[i].Name); - /* Call IpRenewAddress to renew the IP address on the specified adapter. */ if (IpRenewAddress(&AdapterInfo) != NO_ERROR) { @@ -755,41 +757,41 @@ int main(int argc, char *argv[]) ProcessHeap = GetProcessHeap(); /* Parse command line for options we have been given. */ - if ( (argc > 1)&&(argv[1][0]=='/' || argv[1][0]=='-') ) + if ((argc > 1) && (argv[1][0]=='/' || argv[1][0]=='-')) { - if( !_tcsicmp( &argv[1][1], _T("?") )) + if (!_tcsicmp(&argv[1][1], _T("?"))) { DoUsage = TRUE; } - else if( !_tcsnicmp( &argv[1][1], _T("ALL"), _tcslen(&argv[1][1]) )) + else if (!_tcsnicmp(&argv[1][1], _T("ALL"), _tcslen(&argv[1][1]))) { DoAll = TRUE; } - else if( !_tcsnicmp( &argv[1][1], _T("RELEASE"), _tcslen(&argv[1][1]) )) + else if (!_tcsnicmp(&argv[1][1], _T("RELEASE"), _tcslen(&argv[1][1]))) { DoRelease = TRUE; } - else if( ! _tcsnicmp( &argv[1][1], _T("RENEW"), _tcslen(&argv[1][1]) )) + else if (!_tcsnicmp(&argv[1][1], _T("RENEW"), _tcslen(&argv[1][1]))) { DoRenew = TRUE; } - else if( ! _tcsnicmp( &argv[1][1], _T("FLUSHDNS"), _tcslen(&argv[1][1]) )) + else if (!_tcsnicmp(&argv[1][1], _T("FLUSHDNS"), _tcslen(&argv[1][1]))) { DoFlushdns = TRUE; } - else if( ! _tcsnicmp( &argv[1][1], _T("FLUSHREGISTERDNS"), _tcslen(&argv[1][1]) )) + else if (!_tcsnicmp(&argv[1][1], _T("FLUSHREGISTERDNS"), _tcslen(&argv[1][1]))) { DoRegisterdns = TRUE; } - else if( ! _tcsnicmp( &argv[1][1], _T("DISPLAYDNS"), _tcslen(&argv[1][1]) )) + else if (!_tcsnicmp(&argv[1][1], _T("DISPLAYDNS"), _tcslen(&argv[1][1]))) { DoDisplaydns = TRUE; } - else if( ! _tcsnicmp( &argv[1][1], _T("SHOWCLASSID"), _tcslen(&argv[1][1]) )) + else if (!_tcsnicmp(&argv[1][1], _T("SHOWCLASSID"), _tcslen(&argv[1][1]))) { DoShowclassid = TRUE; } - else if( ! _tcsnicmp( &argv[1][1], _T("SETCLASSID"), _tcslen(&argv[1][1]) )) + else if (!_tcsnicmp(&argv[1][1], _T("SETCLASSID"), _tcslen(&argv[1][1]))) { DoSetclassid = TRUE; }

1 0

[reactos] 01/01: [COMCTL32] imagelist: Make the exported functions use the internal IImageList2 - Add a hack to rename the exported functions and use the Internal_ prefix for them so that the IImageList can use them with minimal code changes. - Add the correct implementation of the affected exported functions making them now use the IImageList of the passed HIMAGELIST.
by Giannis Adamopoulos 12 Jun '19

12 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc25a266f2717fc8fa763… commit cc25a266f2717fc8fa7637c7569cfdcb7d027457 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Dec 31 02:28:18 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Jun 12 19:20:44 2019 +0300 [COMCTL32] imagelist: Make the exported functions use the internal IImageList2 - Add a hack to rename the exported functions and use the Internal_ prefix for them so that the IImageList can use them with minimal code changes. - Add the correct implementation of the affected exported functions making them now use the IImageList of the passed HIMAGELIST. This indirection is possible because an HIMAGELIST is also a IImageList*. This indirection is also needed because we can end up using image lists created by either comctl32 v5 or comctl32 v6. This is how windows manage to use an HIMAGELIST created by comctl32 v5 when it is passed to comctl32 v6. What really happens in this scenario is that the exported functions of both versions end up using the interface stored in the object without checking if this interface is the version provided in the same dll or in the other. --- dll/win32/comctl32/imagelist.c | 379 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 377 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/imagelist.c b/dll/win32/comctl32/imagelist.c index 1f119f3504e..11ad5080f0a 100644 --- a/dll/win32/comctl32/imagelist.c +++ b/dll/win32/comctl32/imagelist.c @@ -51,6 +51,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagelist); #define MAX_OVERLAYIMAGE 15 +#ifdef __REACTOS__ +//The big bad reactos image list hack! +BOOL is_valid2(HIMAGELIST himl); +INT WINAPI Internal_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon); +BOOL WINAPI Internal_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp); +COLORREF WINAPI Internal_SetBkColor (HIMAGELIST himl, COLORREF clrBk); +BOOL WINAPI Internal_SetOverlayImage (HIMAGELIST himl, INT iImage, INT iOverlay); + +#define ImageList_Add Internal_Add +#define ImageList_ReplaceIcon Internal_ReplaceIcon +#define ImageList_SetOverlayImage Internal_SetOverlayImage +#define ImageList_Replace Internal_Replace +#define ImageList_AddMasked Internal_AddMasked +#define ImageList_Remove Internal_Remove +#define ImageList_GetIcon Internal_GetIcon +#define ImageList_GetImageInfo Internal_GetImageInfo +#define ImageList_Copy Internal_Copy +#define ImageList_Merge Internal_Merge +#define ImageList_Duplicate Internal_Duplicate +#define ImageList_GetIconSize Internal_GetIconSize +#define ImageList_SetIconSize Internal_SetIconSize +#define ImageList_GetImageCount Internal_GetImageCount +#define ImageList_SetImageCount Internal_SetImageCount +#define ImageList_SetBkColor Internal_SetBkColor +#define ImageList_GetBkColor Internal_GetBkColor +#define ImageList_BeginDrag Internal_BeginDrag +#define ImageList_DrawIndirect Internal_DrawIndirect +#endif + struct _IMAGELIST { IImageList2 IImageList2_iface; /* 00: IImageList vtable */ @@ -72,6 +101,9 @@ struct _IMAGELIST INT nOvlIdx[MAX_OVERLAYIMAGE]; /* 38: overlay images index */ /* not yet found out */ + #ifdef __REACTOS__ + ULONG usMagic; + #endif HBRUSH hbrBlend25; HBRUSH hbrBlend50; INT cInitial; @@ -1843,8 +1875,13 @@ DWORD WINAPI ImageList_GetFlags(HIMAGELIST himl) { TRACE("%p\n", himl); - +#ifdef __REACTOS__ + if(!is_valid2(himl)) + return 0; + return himl->flags; +#else return is_valid(himl) ? himl->flags : 0; +#endif } @@ -2032,6 +2069,12 @@ ImageList_GetImageInfo (HIMAGELIST himl, INT i, IMAGEINFO *pImageInfo) BOOL WINAPI ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect) { +#ifdef __REACTOS__ + IMAGEINFO ImageInfo; + if (!ImageList_GetImageInfo(himl, i, &ImageInfo)) + return FALSE; + *lpRect = ImageInfo.rcImage; +#else POINT pt; if (!is_valid(himl) || (lpRect == NULL)) @@ -2044,7 +2087,7 @@ ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect) lpRect->top = pt.y; lpRect->right = pt.x + himl->cx; lpRect->bottom = pt.y + himl->cy; - +#endif return TRUE; } @@ -3300,6 +3343,10 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) UINT WINAPI ImageList_SetColorTable(HIMAGELIST himl, UINT uStartIndex, UINT cEntries, const RGBQUAD *prgb) { +#ifdef __REACTOS__ + if(!is_valid2(himl)) + return 0; +#endif TRACE("(%p, %d, %d, %p)\n", himl, uStartIndex, cEntries, prgb); himl->color_table_set = TRUE; return SetDIBColorTable(himl->hdcImage, uStartIndex, cEntries, prgb); @@ -3526,6 +3573,12 @@ static HRESULT WINAPI ImageListImpl_Copy(IImageList2 *iface, int dst_index, if (!unk_src) return E_FAIL; +#ifdef __REACTOS__ + /* Make sure that the second image list uses the same implementation with the first */ + if (!is_valid2((HIMAGELIST)unk_src)) + return E_FAIL; +#endif + /* TODO: Add test for IID_ImageList2 too */ if (FAILED(IUnknown_QueryInterface(unk_src, &IID_IImageList, (void **) &src))) @@ -3550,6 +3603,12 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList2 *iface, int i1, TRACE("(%p)->(%d %p %d %d %d %s %p)\n", iface, i1, punk2, i2, dx, dy, debugstr_guid(riid), ppv); +#ifdef __REACTOS__ + /* Make sure that the second image list uses the same implementation with the first */ + if (!is_valid2((HIMAGELIST)punk2)) + return E_FAIL; +#endif + /* TODO: Add test for IID_ImageList2 too */ if (FAILED(IUnknown_QueryInterface(punk2, &IID_IImageList, (void **) &iml2))) @@ -3879,7 +3938,12 @@ static BOOL is_valid(HIMAGELIST himl) BOOL valid; __TRY { + #ifdef __REACTOS__ + valid = himl && himl->usMagic == IMAGELIST_MAGIC; + #else valid = himl && himl->IImageList2_iface.lpVtbl == &ImageListImpl_Vtbl; + #endif + } __EXCEPT_PAGE_FAULT { @@ -3926,6 +3990,9 @@ static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID ii if (!This) return E_OUTOFMEMORY; This->IImageList2_iface.lpVtbl = &ImageListImpl_Vtbl; +#ifdef __REACTOS__ + This->usMagic = IMAGELIST_MAGIC; +#endif This->ref = 1; ret = IImageList2_QueryInterface(&This->IImageList2_iface, iid, ppv); @@ -3933,3 +4000,311 @@ static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID ii return ret; } + + + +#ifdef __REACTOS__ +//The big bad reactos image list hack! +#undef ImageList_Add +#undef ImageList_ReplaceIcon +#undef ImageList_SetOverlayImage +#undef ImageList_Replace +#undef ImageList_AddMasked +#undef ImageList_Remove +#undef ImageList_GetIcon +#undef ImageList_GetImageInfo +#undef ImageList_Copy +#undef ImageList_Merge +#undef ImageList_Duplicate +#undef ImageList_GetIconSize +#undef ImageList_SetIconSize +#undef ImageList_GetImageCount +#undef ImageList_SetImageCount +#undef ImageList_SetBkColor +#undef ImageList_GetBkColor +#undef ImageList_BeginDrag +#undef ImageList_DrawIndirect + +static inline IImageList2* IImageList2_from_impl(HIMAGELIST himl) +{ + if (is_valid(himl)) + { + return &himl->IImageList2_iface; + } + return NULL; +} + +BOOL is_valid2(HIMAGELIST himl) +{ + BOOL valid; + __TRY + { + valid = himl && + himl->IImageList2_iface.lpVtbl == &ImageListImpl_Vtbl && + himl->usMagic == IMAGELIST_MAGIC; + } + __EXCEPT_PAGE_FAULT + { + valid = FALSE; + } + __ENDTRY + return valid; +} + +INT WINAPI +ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask) +{ + int res; + HRESULT hr; + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return -1; + + hr = piml->lpVtbl->Add(piml, hbmImage, hbmMask, &res); + if (FAILED(hr)) + return -1; + + return res; +} + +INT WINAPI +ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) +{ + int res; + HRESULT hr; + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return -1; + + hr = piml->lpVtbl->ReplaceIcon(piml, nIndex, hIcon, &res); + if (FAILED(hr)) + return -1; + + return res; +} + +BOOL WINAPI +ImageList_SetOverlayImage (HIMAGELIST himl, INT iImage, INT iOverlay) +{ + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return FALSE; + + return (piml->lpVtbl->SetOverlayImage(piml, iImage, iOverlay) == S_OK) ? TRUE : FALSE; +} + +BOOL WINAPI +ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage, + HBITMAP hbmMask) +{ + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return FALSE; + + return (piml->lpVtbl->Replace(piml, i, hbmImage, hbmMask) == S_OK) ? TRUE : FALSE; +} + +INT WINAPI +ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) +{ + int res; + IImageList2* piml = IImageList2_from_impl(himl); + HRESULT hr; + if (!piml) + return -1; + + hr = piml->lpVtbl->AddMasked(piml, hBitmap, clrMask, &res); + if (FAILED(hr)) + return -1; + + return res; +} + +BOOL WINAPI +ImageList_Remove (HIMAGELIST himl, INT i) +{ + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return -1; + + return (piml->lpVtbl->Remove(piml, i) == S_OK) ? TRUE : FALSE; +} + +HICON WINAPI +ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle) +{ + HICON res; + IImageList2* piml = IImageList2_from_impl(himl); + HRESULT hr; + if (!piml) + return NULL; + + hr = piml->lpVtbl->GetIcon(piml, i, fStyle, &res); + if (FAILED(hr)) + return NULL; + + return res; +} + +BOOL WINAPI +ImageList_GetImageInfo (HIMAGELIST himl, INT i, IMAGEINFO *pImageInfo) +{ + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return FALSE; + + return (piml->lpVtbl->GetImageInfo(piml, i, pImageInfo) == S_OK) ? TRUE : FALSE; +} + +BOOL WINAPI +ImageList_Copy (HIMAGELIST himlDst, INT iDst, HIMAGELIST himlSrc, + INT iSrc, UINT uFlags) +{ + IImageList2 *pimlDst, *pimlSrc; + pimlDst = IImageList2_from_impl(himlDst); + pimlSrc = IImageList2_from_impl(himlSrc); + if (!pimlDst || !pimlSrc) + return FALSE; + + return (pimlDst->lpVtbl->Copy(pimlDst, iDst, (IUnknown*)pimlSrc, iSrc, uFlags) == S_OK) ? TRUE : FALSE; +} + +HIMAGELIST WINAPI +ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, + INT dx, INT dy) +{ + HRESULT hr; + IImageList2 *piml1, *piml2, *pimlMerged; + piml1 = IImageList2_from_impl(himl1); + piml2 = IImageList2_from_impl(himl2); + if (!piml1 || !piml2) + return NULL; + + hr = piml1->lpVtbl->Merge(piml1, i1, (IUnknown*)piml2, i2, dx, dy, &IID_IImageList2, (void**)&pimlMerged); + if (FAILED(hr)) + return NULL; + + return (HIMAGELIST)pimlMerged; +} + +HIMAGELIST WINAPI +ImageList_Duplicate (HIMAGELIST himlSrc) +{ + HRESULT hr; + IImageList2 *piml, *pimlCloned; + piml = IImageList2_from_impl(himlSrc); + if (!piml) + return FALSE; + + hr = piml->lpVtbl->Clone(piml, &IID_IImageList2, (void**)&pimlCloned); + if (FAILED(hr)) + return NULL; + + return (HIMAGELIST)pimlCloned; +} + +BOOL WINAPI +ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy) +{ + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return FALSE; + + return (piml->lpVtbl->GetIconSize(piml, cx, cy) == S_OK) ? TRUE : FALSE; +} + +BOOL WINAPI +ImageList_SetIconSize (HIMAGELIST himl, INT cx, INT cy) +{ + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return FALSE; + + return (piml->lpVtbl->SetIconSize(piml, cx, cy) == S_OK) ? TRUE : FALSE; +} + +INT WINAPI +ImageList_GetImageCount (HIMAGELIST himl) +{ + int res; + HRESULT hr; + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return 0; + + hr = piml->lpVtbl->GetImageCount(piml, &res); + if (FAILED(hr)) + return 0; + + return res; +} + +BOOL WINAPI +ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) +{ + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return FALSE; + + return (piml->lpVtbl->SetImageCount(piml, iImageCount) == S_OK) ? TRUE : FALSE; +} + +COLORREF WINAPI +ImageList_SetBkColor (HIMAGELIST himl, COLORREF clrBk) +{ + COLORREF res; + HRESULT hr; + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return CLR_NONE; + + hr = piml->lpVtbl->SetBkColor(piml, clrBk, &res); + if (FAILED(hr)) + return CLR_NONE; + + return res; +} + +COLORREF WINAPI +ImageList_GetBkColor (HIMAGELIST himl) +{ + COLORREF res; + HRESULT hr; + IImageList2* piml = IImageList2_from_impl(himl); + if (!piml) + return CLR_NONE; + + hr = piml->lpVtbl->GetBkColor(piml, &res); + if (FAILED(hr)) + return CLR_NONE; + + return res; +} + +BOOL WINAPI +ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, + INT dxHotspot, INT dyHotspot) +{ + IImageList2* piml = IImageList2_from_impl(himlTrack); + if (!piml) + return FALSE; + + return (piml->lpVtbl->BeginDrag(piml, iTrack, dxHotspot, dyHotspot) == S_OK) ? TRUE : FALSE; +} + +BOOL WINAPI +ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) +{ + IImageList2* piml; + + if (!pimldp) + return FALSE; + + piml = IImageList2_from_impl(pimldp->himl); + if (!piml) + return FALSE; + + return (piml->lpVtbl->Draw(piml, pimldp) == S_OK) ? TRUE : FALSE; +} + +#endif

1 0

[reactos] 01/01: [IPCONFIG] Show the Description and Physical Address for disconnected network adapters.
by Eric Kohl 12 Jun '19

12 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=419fb423cef95351497a0… commit 419fb423cef95351497a08af1caae0fe732cebba Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Jun 12 18:04:50 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Jun 12 18:04:50 2019 +0200 [IPCONFIG] Show the Description and Physical Address for disconnected network adapters. --- base/applications/network/ipconfig/ipconfig.c | 29 ++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 8198e6702db..fe5b7aced62 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -480,6 +480,7 @@ VOID ShowInfo(BOOL bAll) while (pAdapter) { LPTSTR IntType, myConType; + BOOLEAN bConnected = TRUE; mibEntry.dwIndex = pAdapter->Index; GetIfEntry(&mibEntry); @@ -494,12 +495,13 @@ VOID ShowInfo(BOOL bAll) /* check if the adapter is connected to the media */ if (mibEntry.dwOperStatus != MIB_IF_OPER_STATUS_CONNECTED && mibEntry.dwOperStatus != MIB_IF_OPER_STATUS_OPERATIONAL) { + bConnected = FALSE; _tprintf(_T("\tMedia State . . . . . . . . . . . : Media disconnected\n")); - pAdapter = pAdapter->Next; - continue; } - - _tprintf(_T("\tConnection-specific DNS Suffix. . : %s\n"), pFixedInfo->DomainName); + else + { + _tprintf(_T("\tConnection-specific DNS Suffix. . : %s\n"), pFixedInfo->DomainName); + } if (bAll) { @@ -507,11 +509,20 @@ VOID ShowInfo(BOOL bAll) _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), lpDesc); HeapFree(ProcessHeap, 0, lpDesc); _tprintf(_T("\tPhysical Address. . . . . . . . . : %s\n"), PrintMacAddr(pAdapter->Address)); - if (pAdapter->DhcpEnabled) - _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n")); - else - _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : No\n")); - _tprintf(_T("\tAutoconfiguration Enabled . . . . : \n")); + if (bConnected) + { + if (pAdapter->DhcpEnabled) + _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n")); + else + _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : No\n")); + _tprintf(_T("\tAutoconfiguration Enabled . . . . : \n")); + } + } + + if (!bConnected) + { + pAdapter = pAdapter->Next; + continue; } _tprintf(_T("\tIP Address. . . . . . . . . . . . : %s\n"), pAdapter->IpAddressList.IpAddress.String);

1 0

[reactos] 01/01: [IPCONFIG] Fix crash on 'ipconfig /all'
by Eric Kohl 12 Jun '19

12 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6734d4ca091eab148babd… commit 6734d4ca091eab148babd0c9832d4b0a42c2caee Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Jun 12 17:48:35 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Jun 12 17:48:35 2019 +0200 [IPCONFIG] Fix crash on 'ipconfig /all' Ipconfig should not display invalid 'Lease Obtained' and 'Lease Expires' times because it did not yet receive any DHCP configuration. Fixes CORE-11837 --- base/applications/network/ipconfig/ipconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 51651bca524..8198e6702db 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -543,7 +543,7 @@ VOID ShowInfo(BOOL bAll) _tprintf(_T("\tSecondary WINS Server . . . . . . : %s\n"), pAdapter->SecondaryWinsServer.IpAddress.String); } - if (pAdapter->DhcpEnabled) + if (pAdapter->DhcpEnabled && _tcscmp(pAdapter->DhcpServer.IpAddress.String, _T("255.255.255.255"))) { _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseObtained))); _tprintf(_T("\tLease Expires . . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseExpires)));

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs