Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 61210: [NTVDM]: Code formatting only.
by hbelusca＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: hbelusca Date: Tue Dec 3 23:50:33 2013 New Revision: 61210 URL: http://svn.reactos.org/svn/reactos?rev=61210&view=rev Log: [NTVDM]: Code formatting only. Modified: branches/ntvdm/subsystems/ntvdm/pic.c branches/ntvdm/subsystems/ntvdm/ps2.c Modified: branches/ntvdm/subsystems/ntvdm/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] Tue Dec 3 23:50:33 2013 @@ -199,7 +199,7 @@ if (Number >= 0 && Number < 8) { - /* Check if any of the higher-priorirty interrupts are busy */ + /* Check if any of the higher-priority interrupts are busy */ for (i = 0; i <= Number ; i++) { if (MasterPic.InServiceRegister & (1 << Number)) return; @@ -226,7 +226,7 @@ return; } - /* Check if any of the higher-priorirty interrupts are busy */ + /* Check if any of the higher-priority interrupts are busy */ if (MasterPic.InServiceRegister != 0) return; for (i = 0; i <= Number; i++) { Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Tue Dec 3 23:50:33 2013 @@ -96,7 +96,6 @@ { KeyboardResponse = KeyboardConfig; KeyboardReadResponse = TRUE; - break; } @@ -114,7 +113,6 @@ /* These commands require a response */ KeyboardResponse = Command; KeyboardWriteResponse = TRUE; - break; } @@ -122,7 +120,6 @@ case 0xA7: { // TODO: Mouse support - break; } @@ -130,7 +127,6 @@ case 0xA8: { // TODO: Mouse support - break; } @@ -139,7 +135,6 @@ { KeyboardResponse = 0; KeyboardReadResponse = TRUE; - break; } @@ -148,7 +143,6 @@ { KeyboardResponse = 0x55; KeyboardReadResponse = TRUE; - break; } @@ -185,7 +179,6 @@ { /* Stop the simulation */ VdmRunning = FALSE; - break; } } @@ -245,7 +238,6 @@ { /* Push the data byte to the keyboard queue */ KeyboardQueuePush(Data); - break; } @@ -323,7 +315,6 @@ /* Keyboard IRQ */ PicInterruptRequest(1); - break; } @@ -331,7 +322,6 @@ { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; - break; }

1 0

[dreimer] 61209: [ACLUI] Fix completely b0rked dialog layouts in the one and only dialog in this dll. 12 languages were fixed and the german translation updated.
by dreimer＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: dreimer Date: Tue Dec 3 21:21:19 2013 New Revision: 61209 URL: http://svn.reactos.org/svn/reactos?rev=61209&view=rev Log: [ACLUI] Fix completely b0rked dialog layouts in the one and only dialog in this dll. 12 languages were fixed and the german translation updated. Modified: trunk/reactos/dll/win32/aclui/lang/de-DE.rc trunk/reactos/dll/win32/aclui/lang/el-GR.rc trunk/reactos/dll/win32/aclui/lang/es-ES.rc trunk/reactos/dll/win32/aclui/lang/fr-FR.rc trunk/reactos/dll/win32/aclui/lang/hu-HU.rc trunk/reactos/dll/win32/aclui/lang/id-ID.rc trunk/reactos/dll/win32/aclui/lang/it-IT.rc trunk/reactos/dll/win32/aclui/lang/ja-JP.rc trunk/reactos/dll/win32/aclui/lang/nl-NL.rc trunk/reactos/dll/win32/aclui/lang/ru-RU.rc trunk/reactos/dll/win32/aclui/lang/sv-SE.rc trunk/reactos/dll/win32/aclui/lang/th-TH.rc Modified: trunk/reactos/dll/win32/aclui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/de-DE.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,9 +5,9 @@ CAPTION "Sicherheit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Gruppen oder Benutzernamen:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE - LTEXT "&Owner:", -1, 7, 7, 49, 8 + LTEXT "&Gruppen oder Benutzernamen:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Besitzer:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&HinzufÃ¼gen...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 PUSHBUTTON "&Entfernen", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/el-GR… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/el-GR.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "ÎÏÏÎ¬Î»ÎµÎ¹Î±" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&ÎÎ½ÏÎ¼Î±ÏÎ± Î¿Î¼Î¬Î´ÏÎ½ ÎºÎ±Î¹ ÏÏÎ·ÏÏÏÎ½:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&ÎÎ½ÏÎ¼Î±ÏÎ± Î¿Î¼Î¬Î´ÏÎ½ ÎºÎ±Î¹ ÏÏÎ·ÏÏÏÎ½:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "Î &ÏÎ¿ÏÎ¸Î®ÎºÎ·...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/es-ES… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/es-ES.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -7,8 +7,8 @@ CAPTION "Seguridad" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Nombres de g&rupos o usuarios:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "Nombres de g&rupos o usuarios:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "AÃ±adir...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/fr-FR.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "SÃ©curitÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Groupe ou noms d'utilisateurs:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Groupe ou noms d'utilisateurs:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "A&jouter...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/hu-HU… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/hu-HU.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -7,8 +7,8 @@ CAPTION "BiztonsÃ¡g" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Csoport vagy felhasznÃ¡lÃ³ nevek:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Csoport vagy felhasznÃ¡lÃ³ nevek:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "H&ozzÃ¡adÃ¡s...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/id-ID… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/id-ID.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "Keamanan" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Grup atau nama pengguna:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Grup atau nama pengguna:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Tambah...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/it-IT… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/it-IT.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "Security" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Nomi di &Gruppo o utente:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "Nomi di &Gruppo o utente:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Aggiungi...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/ja-JP.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "ã»ãã¥ãªãã£" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "ã°ã«ã¼ãåã¾ãã¯ã¦ã¼ã¶ã¼å:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "ã°ã«ã¼ãåã¾ãã¯ã¦ã¼ã¶ã¼å:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "è¿½å (&D)...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/nl-NL… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/nl-NL.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "Beveiling" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Groep of gebruikersnamen:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Groep of gebruikersnamen:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Toevoegen...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/ru-RU.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&ÐÐ¼Ñ Ð³ÑÑÐ¿Ð¿Ñ Ð¸Ð»Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&ÐÐ¼Ñ Ð³ÑÑÐ¿Ð¿Ñ Ð¸Ð»Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "ÐÐ¾&Ð±Ð°Ð²Ð¸ÑÑ...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/sv-SE… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/sv-SE.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "SÃ¤kerhet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Grupp eller anvÃ¤ndarnamn:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Grupp eller anvÃ¤ndarnamn:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "&LÃ¤gg till...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 Modified: trunk/reactos/dll/win32/aclui/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/th-TH… ============================================================================== --- trunk/reactos/dll/win32/aclui/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/lang/th-TH.rc [iso-8859-1] Tue Dec 3 21:21:19 2013 @@ -5,8 +5,8 @@ CAPTION "à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ à¸±à¸¢" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&à¸à¸·à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸«à¸£à¸·à¸à¸à¸·à¹à¸à¸à¸à¸à¸à¸¹à¹à¹à¸à¹:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&à¸à¸·à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸«à¸£à¸·à¸à¸à¸·à¹à¸à¸à¸à¸à¸à¸¹à¹à¹à¸à¹:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE LTEXT "&Owner:", -1, 7, 7, 49, 8 EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "à¹&à¸à¸´à¹à¸¡...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14

1 0

[akhaldi] 61208: [TWAIN_32_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: akhaldi Date: Tue Dec 3 11:27:55 2013 New Revision: 61208 URL: http://svn.reactos.org/svn/reactos?rev=61208&view=rev Log: [TWAIN_32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/twain_32/CMakeLists.txt trunk/rostests/winetests/twain_32/dsm.c trunk/rostests/winetests/twain_32/testlist.c Modified: trunk/rostests/winetests/twain_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/CMakeL… ============================================================================== --- trunk/rostests/winetests/twain_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/twain_32/CMakeLists.txt [iso-8859-1] Tue Dec 3 11:27:55 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(twain_32_winetest dsm.c testlist.c) -target_link_libraries(twain_32_winetest wine) set_module_type(twain_32_winetest win32cui) -add_importlibs(twain_32_winetest user32 gdi32 msvcrt kernel32 ntdll) +add_importlibs(twain_32_winetest user32 gdi32 msvcrt kernel32) add_cd_file(TARGET twain_32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/twain_32/dsm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/dsm.c?… ============================================================================== --- trunk/rostests/winetests/twain_32/dsm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/twain_32/dsm.c [iso-8859-1] Tue Dec 3 11:27:55 2013 @@ -18,7 +18,7 @@ * */ #include <stdarg.h> -#include <assert.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -33,6 +33,7 @@ static BOOL dsm_RegisterWindowClasses(void) { WNDCLASSA cls; + BOOL rc; cls.style = 0; cls.lpfnWndProc = DefWindowProc; @@ -44,9 +45,10 @@ cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "TWAIN_dsm_class"; - if (!RegisterClassA(&cls)) return FALSE; - - return TRUE; + + rc = RegisterClassA(&cls); + ok(rc, "RegisterClassA failed: le=%u\n", GetLastError()); + return rc; } @@ -832,7 +834,11 @@ HANDLE hwnd; HMODULE htwain; - if (!dsm_RegisterWindowClasses()) assert(0); + if (!dsm_RegisterWindowClasses()) + { + skip("Could not register the test class, skipping tests\n"); + return; + } htwain = LoadLibraryA("twain_32.dll"); if (! htwain) Modified: trunk/rostests/winetests/twain_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/testli… ============================================================================== --- trunk/rostests/winetests/twain_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/twain_32/testlist.c [iso-8859-1] Tue Dec 3 11:27:55 2013 @@ -1,7 +1,4 @@ /* Automatically generated file; DO NOT EDIT!! */ - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> #define STANDALONE #include "wine/test.h"

1 0

[akhaldi] 61207: [TWAIN_32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: akhaldi Date: Tue Dec 3 11:27:32 2013 New Revision: 61207 URL: http://svn.reactos.org/svn/reactos?rev=61207&view=rev Log: [TWAIN_32] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/win32/twain_32/README trunk/reactos/dll/win32/twain_32/TWAIN trunk/reactos/dll/win32/twain_32/capability.c trunk/reactos/dll/win32/twain_32/ds_audio.c trunk/reactos/dll/win32/twain_32/ds_ctrl.c trunk/reactos/dll/win32/twain_32/ds_image.c trunk/reactos/dll/win32/twain_32/twain.h Modified: trunk/reactos/dll/win32/twain_32/CMakeLists.txt trunk/reactos/dll/win32/twain_32/dsm_ctrl.c trunk/reactos/dll/win32/twain_32/twain32_main.c trunk/reactos/dll/win32/twain_32/twain_i.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/twain_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/CMakeLi… Removed: trunk/reactos/dll/win32/twain_32/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/README?… Removed: trunk/reactos/dll/win32/twain_32/TWAIN URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/TWAIN?r… Removed: trunk/reactos/dll/win32/twain_32/capability.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/capabil… Removed: trunk/reactos/dll/win32/twain_32/ds_audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/ds_audi… Removed: trunk/reactos/dll/win32/twain_32/ds_ctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/ds_ctrl… Removed: trunk/reactos/dll/win32/twain_32/ds_image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/ds_imag… Modified: trunk/reactos/dll/win32/twain_32/dsm_ctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/dsm_ctr… Removed: trunk/reactos/dll/win32/twain_32/twain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain.h… Modified: trunk/reactos/dll/win32/twain_32/twain32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain32… Modified: trunk/reactos/dll/win32/twain_32/twain_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain_i… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 61206: [INETCPL] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: akhaldi Date: Tue Dec 3 10:33:02 2013 New Revision: 61206 URL: http://svn.reactos.org/svn/reactos?rev=61206&view=rev Log: [INETCPL] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/cpl/inetcpl/inetcpl.svg Modified: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt trunk/reactos/dll/cpl/inetcpl/general.c trunk/reactos/dll/cpl/inetcpl/inetcpl.c trunk/reactos/dll/cpl/inetcpl/inetcpl.h trunk/reactos/dll/cpl/inetcpl/inetcpl.ico trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/inetcpl/inetcpl.spec trunk/reactos/dll/cpl/inetcpl/security.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt [iso-8859-1] Tue Dec 3 10:33:02 2013 @@ -1,6 +1,5 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(inetcpl.cpl inetcpl.spec) list(APPEND SOURCE @@ -8,13 +7,12 @@ content.c general.c security.c - inetcpl.rc ${CMAKE_CURRENT_BINARY_DIR}/inetcpl_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/inetcpl.def) -add_library(inetcpl SHARED ${SOURCE}) +add_library(inetcpl SHARED ${SOURCE} inetcpl.rc) set_module_type(inetcpl cpl UNICODE) target_link_libraries(inetcpl wine) -add_importlibs(inetcpl advapi32 comctl32 user32 gdi32 shlwapi msvcrt kernel32 ntdll) -add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon) +add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll) +add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32) add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/cpl/inetcpl/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/general.c?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/general.c [iso-8859-1] Tue Dec 3 10:33:02 2013 @@ -33,6 +33,7 @@ #include <winreg.h> #include <shlwapi.h> //#include <prsht.h> +#include <shlobj.h> #include "inetcpl.h" @@ -52,9 +53,7 @@ IDC_HOME_DEFAULT, IDC_HISTORY_SETTINGS, 0}; -static DWORD disabled_delhist_buttons[] = {IDC_DELETE_COOKIES, - IDC_DELETE_HISTORY, - IDC_DELETE_FORM_DATA, +static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA, IDC_DELETE_PASSWORDS, 0}; @@ -69,8 +68,25 @@ switch (wparam) { case MAKEWPARAM(IDOK, BN_CLICKED): - if (!FreeUrlCacheSpaceW(NULL, 100, FCS_PERCENT_CACHE_SPACE)) - break; /* Don't close the dialog. */ + if (IsDlgButtonChecked(hdlg, IDC_DELETE_TEMP_FILES)) + FreeUrlCacheSpaceW(NULL, 100, 0); + + if (IsDlgButtonChecked(hdlg, IDC_DELETE_COOKIES)) + { + WCHAR pathW[MAX_PATH]; + + if(SHGetSpecialFolderPathW(NULL, pathW, CSIDL_COOKIES, TRUE)) + FreeUrlCacheSpaceW(pathW, 100, 0); + } + + if (IsDlgButtonChecked(hdlg, IDC_DELETE_HISTORY)) + { + WCHAR pathW[MAX_PATH]; + + if(SHGetSpecialFolderPathW(NULL, pathW, CSIDL_HISTORY, TRUE)) + FreeUrlCacheSpaceW(pathW, 100, 0); + } + EndDialog(hdlg, IDOK); return TRUE; Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.c?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.c [iso-8859-1] Tue Dec 3 10:33:02 2013 @@ -39,6 +39,7 @@ #include "inetcpl.h" + WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); DECLSPEC_HIDDEN HMODULE hcpl; @@ -60,6 +61,15 @@ hcpl = hdll; } return TRUE; +} + +/*********************************************************************** + * DllInstall (inetcpl.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall ? "TRUE" : "FALSE", debugstr_w(cmdline)); + return S_OK; } /****************************************************************************** @@ -203,3 +213,23 @@ display_cpl_sheets(parent); return TRUE; } + +/********************************************************************* + * LaunchConnectionDialog (inetcpl.@) + * + */ +BOOL WINAPI LaunchConnectionDialog(HWND hParent) +{ + FIXME("(%p): stub\n", hParent); + return FALSE; +} + +/********************************************************************* + * LaunchInternetControlPanel (inetcpl.@) + * + */ +BOOL WINAPI LaunchPrivacyDialog(HWND hParent) +{ + FIXME("(%p): stub\n", hParent); + return FALSE; +} Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.h?… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.h [iso-8859-1] Tue Dec 3 10:33:02 2013 @@ -54,6 +54,7 @@ /* icons */ #define ICO_MAIN 100 +#define ICO_INTERNET 1313 /* strings */ #define IDS_CPL_NAME 1 Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.ic… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Tue Dec 3 10:33:02 2013 @@ -89,3 +89,4 @@ /* @makedep: inetcpl.ico */ ICO_MAIN ICON "inetcpl.ico" +ICO_INTERNET ICON "inetcpl.ico" Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.sp… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.spec [iso-8859-1] Tue Dec 3 10:33:02 2013 @@ -3,15 +3,15 @@ @ stub AddInternetPropertySheetsEx @ stdcall CPlApplet(long long long long) @ stub DisplayPopupWindowManagementDialog -@ stub DllInstall +@ stdcall -private DllInstall(long wstr) @ stub GetAddSitesDisplayUrl @ stub ImportExportPFX @ stub LaunchAddSitesDialog -@ stub LaunchConnectionDialog +@ stdcall LaunchConnectionDialog(long) @ stdcall LaunchInternetControlPanel(long) @ stub LaunchPerSitePrivacyActionDialog @ stub LaunchPopupWindowManagementDialog -@ stub LaunchPrivacyDialog +@ stdcall LaunchPrivacyDialog(long) @ stub LaunchSecurityDialog @ stub LaunchSecurityDialogEx @ stdcall LaunchSiteCertDialog(long) Removed: trunk/reactos/dll/cpl/inetcpl/inetcpl.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.sv… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.svg [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.svg (removed) @@ -1,265 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg xmlns="http://www.w3.org/2000/svg" height="64" width="368" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs id="defs4"> - <radialGradient id="radialGradient11220" gradientUnits="userSpaceOnUse" cx="11.827" cy="10.476" r="32.665" gradientTransform="scale(1.179536,0.847791)"> - <stop id="stop4352" stop-color="#FFF" offset="0"/> - <stop id="stop4354" stop-color="#FFF" stop-opacity="0" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient4750"> - <stop id="stop4752" stop-color="#FFF" offset="0"/> - <stop id="stop4758" stop-color="#8dea32" offset="0.37931"/> - <stop id="stop4754" stop-color="#1d1d1d" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient11866" cx="10.12" gradientUnits="userSpaceOnUse" cy="11.506" r="12.5" gradientTransform="matrix(-0.04000001,1.68,-1.919456,-0.04570131,32.610234,-4.9707731)"> - <stop id="stop4222" stop-color="#FFF" offset="0"/> - <stop id="stop4130" stop-color="#FFF" stop-opacity="0.16494845" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient3567" gradientUnits="userSpaceOnUse" cx="39.898" cy="55.224" r="21.958" gradientTransform="matrix(-0.3691255,0.5567795,-0.2666977,-0.1768112,331.68484,32.943202)"> - <stop id="stop11061" stop-color="#fbd23b" offset="0"/> - <stop id="stop11063" stop-color="#f0aa18" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient3654" gradientUnits="userSpaceOnUse" cx="18.248" cy="15.716" r="29.993" gradientTransform="matrix(0.3333297,0,0,0.333337,296,40.168359)"> - <stop id="stop11051" stop-color="#d3e9ff" offset="0"/> - <stop id="stop11053" stop-color="#0074e7" offset="0.4625"/> - <stop id="stop11055" stop-color="#4074ae" offset="0.75"/> - <stop id="stop11057" stop-color="#36486c" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient3960" gradientUnits="userSpaceOnUse" fx="18.934" fy="17.81" xlink:href="#linearGradient4750" cx="18.634" cy="17.486" r="40.693" gradientTransform="matrix(0.33951462,0,0,0.31582769,295.97302,40.178653)"/> - <radialGradient id="radialGradient4120" cx="15.116" gradientUnits="userSpaceOnUse" cy="63.965" r="12.289" gradientTransform="scale(1.64399,0.608276)"> - <stop id="stop4116" stop-color="#000" offset="0"/> - <stop id="stop4118" stop-color="#000" stop-opacity="0" offset="1"/> - </radialGradient> - <filter id="filter3436" height="1.2801698" width="1.1580106" color-interpolation-filters="sRGB" y="-0.14008497" x="-0.079005308"> - <feGaussianBlur id="feGaussianBlur3438" stdDeviation="0.3190069"/> - </filter> - <radialGradient id="radialGradient4426" gradientUnits="userSpaceOnUse" cx="37.375" cy="33.188" r="14.625" gradientTransform="matrix(1,0,0,0.226496,0,25.67067)"> - <stop id="stop4335" stop-color="#000" offset="0"/> - <stop id="stop4337" stop-color="#000" stop-opacity="0" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient4727" y2="9.277" gradientUnits="userSpaceOnUse" y1="19.122" x2="21.44" x1="29.455"> - <stop id="stop3230" stop-color="#373737" offset="0"/> - <stop id="stop3232" stop-color="#cfcfcf" stop-opacity="0.67826086" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient4729" y2="5.0354" xlink:href="#linearGradient3198" gradientUnits="userSpaceOnUse" y1="12.038" x2="17.799" x1="25.269"/> - <linearGradient id="linearGradient3198"> - <stop id="stop3200" stop-color="#FFF" offset="0"/> - <stop id="stop3202" stop-color="#FFF" stop-opacity="0" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient4731" y2="25.5" gradientUnits="userSpaceOnUse" y1="27.5" gradientTransform="translate(-8.0000004,15.967633)" x2="20.5" x1="16"> - <stop id="stop3375" stop-color="#000" offset="0"/> - <stop id="stop3377" stop-color="#373737" stop-opacity="0" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient4733" y2="27" gradientUnits="userSpaceOnUse" y1="27" gradientTransform="translate(-8.0000004,15.967633)" x2="21.5" x1="16"> - <stop id="stop3444" stop-color="#000" offset="0"/> - <stop id="stop3446" stop-color="#000" stop-opacity="0" offset="1"/> - </linearGradient> - <filter id="filter3391" height="1.336" width="1.1344" color-interpolation-filters="sRGB" y="-0.168" x="-0.067199998"> - <feGaussianBlur id="feGaussianBlur3393" stdDeviation="0.14"/> - </filter> - <radialGradient id="radialGradient4442" gradientUnits="userSpaceOnUse" cx="25.017" cy="13.192" r="9.7513" gradientTransform="matrix(1,0,0,0.4950025,0,5.5549725)"> - <stop id="stop3173" stop-color="#fd0000" offset="0"/> - <stop id="stop3175" stop-color="#6a0000" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient4444" y2="7.1352" gradientUnits="userSpaceOnUse" y1="15.984" x2="22.036" x1="27.217"> - <stop id="stop4404" stop-color="#e80000" offset="0"/> - <stop id="stop4406" stop-color="#490000" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient4480" gradientUnits="userSpaceOnUse" cx="18" cy="14.19" r="5.5055" gradientTransform="matrix(0.7756645,0,0,0.1405889,189.07986,38.819422)"> - <stop id="stop3454" stop-color="#FFF" offset="0"/> - <stop id="stop3456" stop-color="#FFF" stop-opacity="0" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient4483" y2="18.312" xlink:href="#linearGradient3198" gradientUnits="userSpaceOnUse" y1="18.312" gradientTransform="matrix(0.7756645,0,0,0.7646744,183.54755,25.108896)" x2="23" x1="17.605"/> - <radialGradient id="radialGradient4488" gradientUnits="userSpaceOnUse" cx="26.625" cy="26.577" r="12.5" gradientTransform="matrix(0.73586,-0.2418113,0.0892014,0.2638127,181.57311,44.114042)"> - <stop id="stop3191" stop-color="#e40000" offset="0"/> - <stop id="stop3193" stop-color="#490000" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient4491" y2="27" gradientUnits="userSpaceOnUse" y1="33" gradientTransform="matrix(0.7756645,0,0,0.7646745,182.88405,25.618464)" x2="19" x1="29"> - <stop id="stop3222" stop-color="#373737" offset="0"/> - <stop id="stop3224" stop-color="#FFF" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient4498" gradientUnits="userSpaceOnUse" cx="27.5" cy="22.614" r="6.5" gradientTransform="matrix(1.1933298,-0.058821,0.07448995,1.468693,169.71373,12.374745)"> - <stop id="stop3348" stop-color="#737373" offset="0"/> - <stop id="stop3350" stop-color="#d1d1d1" stop-opacity="0.68695652" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient4504" gradientUnits="userSpaceOnUse" cx="39.898" cy="55.224" r="21.958" gradientTransform="matrix(-0.738251,1.113559,-0.5333955,-0.3536224,247.36969,9.886403)"> - <stop id="stop11061-9" stop-color="#fbd23b" offset="0"/> - <stop id="stop11063-7" stop-color="#f0aa18" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient4508" gradientUnits="userSpaceOnUse" fx="18.934" fy="17.81" xlink:href="#linearGradient4750" cx="18.634" cy="17.486" r="40.693" gradientTransform="matrix(0.67902924,0,0,0.63165538,175.94603,24.357306)"/> - <radialGradient id="radialGradient4565" gradientUnits="userSpaceOnUse" cx="18.248" cy="15.716" r="29.993" gradientTransform="matrix(0.6666594,0,0,0.666674,176,24.336717)"> - <stop id="stop11051-7" stop-color="#d3e9ff" offset="0"/> - <stop id="stop11053-6" stop-color="#0074e7" offset="0.4625"/> - <stop id="stop11055-3" stop-color="#4074ae" offset="0.75"/> - <stop id="stop11057-1" stop-color="#36486c" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient4568" y2="19" xlink:href="#linearGradient3198" gradientUnits="userSpaceOnUse" y1="25.27" gradientTransform="matrix(0.7719782,0,0,0.7714112,-6.5013771,-5.8926391)" x2="22" x1="30.376"/> - <filter id="filter3391-0" height="1.336" width="1.1344" color-interpolation-filters="sRGB" y="-0.168" x="-0.067199998"> - <feGaussianBlur id="feGaussianBlur3393-5" stdDeviation="0.14"/> - </filter> - <filter id="filter3436-1" height="1.2801698" width="1.1580106" color-interpolation-filters="sRGB" y="-0.14008497" x="-0.079005308"> - <feGaussianBlur id="feGaussianBlur3438-1" stdDeviation="0.3190069"/> - </filter> - <linearGradient id="linearGradient5044" y2="9.277" gradientUnits="userSpaceOnUse" y1="14.243" x2="21.44" x1="27.681"> - <stop id="stop3230-0" stop-color="#373737" offset="0"/> - <stop id="stop3232-2" stop-color="#cfcfcf" stop-opacity="0.67826086" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient5072" gradientUnits="userSpaceOnUse" cx="18" cy="14.19" r="5.5055" gradientTransform="matrix(1.0342194,0,0,0.1874519,30.96392,32.698214)"> - <stop id="stop3454-4" stop-color="#FFF" offset="0"/> - <stop id="stop3456-6" stop-color="#FFF" stop-opacity="0" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient5077" y2="18.312" xlink:href="#linearGradient3198" gradientUnits="userSpaceOnUse" y1="18.312" gradientTransform="matrix(1.0342194,0,0,1.019566,23.587507,14.417512)" x2="23" x1="17.605"/> - <radialGradient id="radialGradient5082" gradientUnits="userSpaceOnUse" cx="26.625" cy="26.577" r="12.5" gradientTransform="matrix(0.9811466,-0.3224151,0.1189352,0.3517503,20.95492,39.75771)"> - <stop id="stop3191-2" stop-color="#e40000" offset="0"/> - <stop id="stop3193-8" stop-color="#490000" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient5085" y2="27" gradientUnits="userSpaceOnUse" y1="33" gradientTransform="matrix(1.0342194,0,0,1.0195661,22.702846,15.096582)" x2="19" x1="29"> - <stop id="stop3222-3" stop-color="#373737" offset="0"/> - <stop id="stop3224-6" stop-color="#FFF" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient5090" gradientUnits="userSpaceOnUse" cx="27.5" cy="22.614" r="6.5" gradientTransform="matrix(1.5911065,-0.078428,0.09931994,1.9582576,5.142417,-2.561356)"> - <stop id="stop3348-0" stop-color="#737373" offset="0"/> - <stop id="stop3350-5" stop-color="#d1d1d1" stop-opacity="0.68695652" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient5096" gradientUnits="userSpaceOnUse" cx="39.898" cy="55.224" r="21.958" gradientTransform="matrix(-1.1073764,1.6703384,-0.8000932,-0.5304336,115.05453,-13.170394)"> - <stop id="stop11061-6" stop-color="#fbd23b" offset="0"/> - <stop id="stop11063-4" stop-color="#f0aa18" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient5099" gradientUnits="userSpaceOnUse" cx="15.601" cy="12.142" r="43.527" gradientTransform="matrix(0.999989,0,0,1.000011,8,8.505077)"> - <stop id="stop4128-2" stop-color="#FFF" offset="0"/> - <stop id="stop4130-5" stop-color="#FFF" stop-opacity="0.16494845" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient5102" gradientUnits="userSpaceOnUse" fx="18.934" fy="17.81" xlink:href="#linearGradient4750" cx="18.634" cy="17.486" r="40.693" gradientTransform="matrix(1.0185439,0,0,0.94748308,7.919048,8.53596)"/> - <radialGradient id="radialGradient5143" gradientUnits="userSpaceOnUse" cx="18.248" cy="15.716" r="29.993" gradientTransform="matrix(0.999989,0,0,1.000011,8,8.505077)"> - <stop id="stop11051-9" stop-color="#d3e9ff" offset="0"/> - <stop id="stop11053-0" stop-color="#0074e7" offset="0.4625"/> - <stop id="stop11055-8" stop-color="#4074ae" offset="0.75"/> - <stop id="stop11057-13" stop-color="#36486c" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient5146" y2="19" xlink:href="#linearGradient3198" gradientUnits="userSpaceOnUse" y1="25.27" gradientTransform="matrix(1.0293043,0,0,1.0285483,-8.6685031,-7.8568524)" x2="22" x1="30.376"/> - </defs> - <image id="icon:16-4" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAAXNSR0IArs4c6QAAADBQTFRFAAAA fwAAAH8Af38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////HPn1FAAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsdEDQd6Exl SgAAAGtJREFUCNdNzjEKwCAMBVBBTyJOoYNgNx1EMnpK6eSqm5t29FCN4tAs//EDIYytMXoHmlZ2 jlZWJaZ14AlxlAkPbaJ1s4NngoopM2EV+QAWeJFXh0SokN5AsDcoDIodeIIOiEj3eKuI/vfCB+jq JRZXnyTPAAAAAElFTkSuQmCC " height="16" width="16" y="40" x="344"/> - <image id="icon:16-8" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAf5QTFRFODxt OTlsOTttPD5wPT9xQ0JlO0V1PEluQUliRUZ2Rkd3SEl2SUt6SUxySkt5Skt6QFNQQlRpR1NzU1l4 hVgkVF58Y2BfB3HSCnLKB3TgEnTWF3TSVW9SHHTNo2ECNXOaomIFJXTFLXS+MnS6pmQDhmlGOnWz X3NyqmgEo2kRmmooQoB2GIHprm0HsG8HsnAHPYh+tHMJb3ugcX96t3YKpHg1uHcKKYvrWoWsuXwV dIOnuH0dT5xiv4MXUZinv4YjqYxEsIpIn5A/dpllnY9kw4spgJO1eJW7Xp/FaqOQuJRBgp6DZa88 ZLA7gZu/mZqFjJq2hZ2vwZdJbqehea5PXKfxXajxi6DFeK19qZ+Bh6qNxJ9IbrhbvaFZxqJJja9z x6FTeLw3z6FLkaugdcEvkrCLgrOkd8BQl7Ciz6lR0qpYeskw1Kxaecs1fMsuoLan261Ukr2Ri8R+ 3bBTu7Sdm8Cqtbycjs5j27hiwbun3bpinst6hdwwoM154L1kvMaCn9Jt48Bhn8jn58Nhnsv3kuFM 68RrrNSKnttu6sVsos347MVuxMq57Mdi7shhjeoypc/48Mlfj+o2nONW8Mpw8MtqlutCl+tFpOVs 99FevdupoO1UuOCY+dNbo+1Z+tRa9dN3t+OTytnRruxzvNv7q+9ovOqPv/OM2+q22vPEQpeuKAAA AAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2Qsd EDQsuZJlcAAAANdJREFUGNNjYEAAa1tDOJtNUF9fv9hSVwXCFRLs0e+b6ijIwKAB5gsuKtOf2+xS NIeJQQ7MX1mvP78uMq18+jImiIIV+vMrSiYUeqZPrmWC8GdWVS5pWtgRk9sOEmDXn9jo39VSunzp NJ9qkACrfq+TR1ho8OLZ/dlRIAH9BQ7zZtiZ64jb1KQEggVykidNb5WQlDLIC7ECCuhPMQ2PqPGV llXUTvTmBClo0+TJaJBXUlaziBcGuUK3W5+BwzjAz93NiAviEX1XPRMFEW4+FkaYT4H+RAoDAIcs NxUz8x+eAAAAAElFTkSuQmCC " height="16" width="16" y="40" x="320"/> - <image id="icon:32-4" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAAXNSR0IArs4c6QAAAC1QTFRFAH9/ AAAAfwAAAH8Af38AAAB/wMDAf39//wAAAP8A//8AAAD//wD/AP//////WpO//gAAAAF0Uk5TAEDm 2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QwaEhgQg79CngAA AT9JREFUKM9NkbFqwzAQhj3Y5BG6G0q6i2BEoASiLM5iEEcJ2jo4a3AoImuXdnfbcLsmrY7ooMfp 1CXPUOnkJtF2H9//Y99l2fXlQmS3T9TWXkgBIKwRF6VQXtg4icV1NsKFmgSUP4W4580ICu9ra9YD zkawmSehxyYnAfskcPxMlfgRhQFxBBuMgueV1npHgATPNGOoKUGCYvuzf3yKgNdRGPDww/gxghMJ Afx+tVUEJHiJB2zbLYEouOF4fC7L+x2B5dwrVU0DeAggtwJ759z3tCvfXyMwS+yZUqrrynIaOmoj +x5nAGEu3yIQwDmLmUsFMMYAQHYk5HblQkaBkpV+icAslGShAoDpJoFi+AdZApmMFbegkGFUHhKw YdHr8HcOwsYy+rBwwRVAM2m3dztSrKFrTNr2TDsV40EzivwBowObQVhYSJgAAAAASUVORK5CYII= " height="32" width="32" y="24" x="256"/> - <image id="icon:32-8" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAvpQTFRFOUZn XAQAfgIAiAABlAABcgkOqQAAswAAVhobowkHohQUygsBayUkPj1tOEBsjTc5ziYmmzQ0Qkh0WklM PFGDaktET09vQVRpdk4rcVA2UFmCi1YOUWBlQWGMhFgjW115iFVG4jw6PGaZQGl5TmpRC3LLAHTa VGOPYmRhY2N4AHblol4AFXTUi11dP22jPXVdTGuXn2EJIHTHp2IBgmg5L3S7WXBoKnXCJniym15d pGUC5kpMNXS2JHyoP3Swn2gRwldVYm6SMn9+S3SqTX5MpWsHjnA1FYLrvWFhZXWfqG8bc3WBqmho 11xdhnZPoXMhq3IQXoVLnHYwYH6ij3ZpIIvtQIbOm3szu3gBqnJyrnoie4CDZ4xLa4hxpHl3Z4ei p4IbNY/qa4asd4aYtIEgv4AMnIRMfoiFXJlEWZhZao2VTJiIjIeGhIqAaZo1h4mGYaEsmIpzvn58 13h2cZw/loqKyokMko2MZ5x9eZxVd5O1j5CNb55hwI0xaagnV53ZS5/vbKCZk5WUVaHpm5eGk5qQ brAmypUskJ2Ig6CRYLJGeZ7Ds5pAY6XIyJg+gKxOfqK3a7g+n6CgcrRm3J0Wha9lZLWQY6z2laWr drC6mK+Co6qfdcMwcbTeoq2bdsFcwaSjh75Pj7lr06pNrK2rj7PIdrb0kbHbjLPY2qtNhru0fcVu 165QkL+Anrx6kLjTjr+Wv7VpwbR1l7yrnL2Tgc8ygbz1qrmet75f2a6rm8Kk37ZZrL+b6bZEnr7b gdgvqr7JjsP3m8x4iNsonMqXk9NkldJ1ndJzqsuWj9pX6L9gi984jd1Js8qbiOMwusixq9Rp6cJp uMyrn8z5iugq7Mdms8zft9HZlOw7oedMy87KtN6NsOJ4sdX5+tFK+tJC8891nu5P8dN2+dRXvNy+ zte/ytjMpO9g+tdm+tZ+zdrbsO9tu+mN+tpvsfB1+dt+2tzZ/N55ufKDxe+dzuy31+bZx/OQ2OjO 0uzC4OnQ0Pev6Ovo2fi85fjZJIzH/wAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMA AA3XAAAN1wFCKJt4AAAAB3RJTUUH2QwaEhoyZOlh+AAAAu1JREFUOMtjYMAOrKy0jbUZGHDKtq/c OyU1ApsST09Rw5RTL9/vDtA2NtbWRpf09OwM97r4/v3FKGOwCKoKz83Xv290Xfz+7fs+e2GIkDaK 9u9P1qelPHrx4lGU36pdfHxoCjy/fF26Oaj2/b23F+3Tp805emIqH4oCzx/Xl93273t//+Nu+wm9 kzMnnr6ziBdFwd83WwIWf7z/drf9iplrV8+/cW7rbT5kB/z9/DlqzUegfq99B7cde36htRoMEA74 862nDyx/7fLBDccrqpu2nz17fnZTNdyATztS3gPN97p29/K2DY29Tb9/f7j14ffvJpiCPxdcH917 cRUkf3DbkXeHZj979fTSpfOzJ0HlP5+1v/j48SP7AyD5zZ/erdv+/fv5Pdtnz5sEscPzl9vKt/fe e824DJTf9ubT61l7fj5tCSlsmQRTsCnl/b33UenTl21btmzup3fPOxR2FnGysXFy+ZRDFNg/ePy+ 1q+5AQTq3z1/WM26s1hA0dra2gGiQLLv7ce+hNfHGxITE0Pds5+f6eBY4MPEzMzEZAlRYPjgxVX7 m8+fHwVKu2tpWajGi+rGMbIyMbPEQRT0vX3vVXLj4cOHJ7O1gEBNx66ah5+JhY0daoPxxZdrTLqu 3AABJ6C0jqpRTY4gJzu3bykkGAJePjDstt1/7ty5K3NUQdLmppn95ZEekeWQ6NJe+XKl3PIwp/37 9x+eqKpqBJS3yWirzC/NgUan8amXtRLqK8wLtm6do29uDpS2s3OpK8itzodGhPaDl1YMfEndGXPm uJiagqT19JQL8tKro2EKXl60YmDg89yysE7Zzs7OWU9PSUk2JtY7H2aC8YPdQAUMfHzrspzBskpK BsGOvAgFVhdBJoCUOCZXVSUFByclOUrJ51fnV0Ndod33EqLA0JAPBqKX3LqVr6GxZBLUiFNW2tra wOwKT8TVt27dql5y6/cSqCv69k6ZUmZljJSK85smLVkyCeYKYBY0xpnXASTWXyUaKMXkAAAAAElF TkSuQmCC " height="32" width="32" y="24" x="216"/> - <image id="icon:48-4" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAADBQTFRFAH9/ AAAAAAB/AH8AfwAAfwB/f38AwMDAf39/AAD/AP8AAP///wAA/wD///8A////fgjImAAAAAF0Uk5T AEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QwaEh05vHou twAAAfxJREFUOMuNlLuK20AUhoWKJW3eQIxg13KpU6w9tWBV7EMYBwacwkUcGJNmBRFESROQYNmp B+JlnmNLP4dKt9nOOWcusjZKkanE/813jjQXRdF/DyHE6h/xlTidTv2UiC3GQvSTHKcLgdooixlj 15RTmVGXOFPqcWvnU6fV33kv2FuAubK5gmQM4iUK1GDTmTwZgbl2wkYB1zk2D4IxSyuoTnGjkwHM EXjBgYtgfllBAeBzPgZOwPk4BmU+CN0EBAGANziGSl7A3mohz2dZBeAF1cHy+42Un149CAK+FHwF fOGZBSkBJ2DnHwa+7PZuAfnWCykBnR4OHjx6gb7i2ejdTrruBKyQWWBub+WNA6GSMw74HT8DsJUy MppmXxRFaT8Rj0D/AZR7q/ru8/F4fCkJUCVc9wwHQH1HRuFB/xGBUi2OuhzAFQrccG2VbFE0mL9U FvRrWmudk/FUlJgPgGvDeY5nkc1w/v19UdkWgqUoaFsqramS771mKeccSGDpoi6OZeXAhjFAg7UZ azv9XNhCtkXLUtwJZwD4nUWwyqiW7Y0uzKoAorhNvUDg6QKibASWIyOKO/CVWNa+G4GIwZAnb0DE VMjDgfMgurZ7iPnD63tHtid7T8WajCT6dv7dyL2723jjhQh3pXmQUjbDT0JcrvzlUI/nT/430/AP qaVpr1KpjGYAAAAASUVORK5CYII= " height="48" width="48" y="8" x="120"/> - <image id="icon:48-8" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c6QAAAv1QTFRFQER5 ZgAAfQACUwwMkQAApQAAoAoOwgUD1wAEciYioSMhPT88cTIxvCkqRUd1jzg4RUpuPFk2P1pMTVF9 2DI2PFyHIWaKqkdFcldROmOVWF6EwEdHZV50n1wAg185UmeAll4RAHXnSmmVZWZkPmyiFXTNPHZM DnbdSXYwAHrnF3XVJ3PAInTIMHS8o2QLZWqNPXOvNHW2QnOoVHZ1Nn97bW2OZm6ZpGoTpWsHjW41 gm5iTH1uVnefn24nZnaCiW5tY3WgK4ib11xdm21pdnl2g3wzQoaQRYK0eX85VIo+anqeqHQksHQR SYpoa39yM4bTrnQean+BI4rtbH6cboGSQIyzqno0Yo85fX+XXZQpT5ZDqX8eZ4tvXIyMuX8dn4FW 1XButoEpN5PtroFDnYOEiYmHrIZKn4hlZKAoVJTPe42rc4+2Up6NUpyrQ5rvc5aSlI+NZKgml46W j5KOwY0ygZSsYp20sI9gW6h/0pAQZJ7Pm5aBjpuFZKOzaq8thqB8gaZaaqxkVqTwfKZvhaRqxI6N iKNwsZ05hZ2/sph0lpyg34mJXqbpnJ2aarVDb7YrzJk/ypw/nKKYs56CqakztaCEu5ybca3SdrKU dMEupKauc8A+d7LJpqilnrNSgrpmjLOX1KZGb7P0o62bgriRoq+RdLul5agns6yXlLtso7SOtrCJ lLTWhLy8fM0snrqHnbe4nMJZxK6rpLqdkbvMgb313rJU5aiotre3l8WJsb2lgtcuks9Wl8iVidNV lcLdjcP21rW1itdHhNwopsTYscmK575f978qwMHCqM6Jqsurmcn2n9ODscyZiOMwtcujxct698JI qNZ8+MYwjOkr98dJpdxrt9hr+Mo998lak+s6+s02utLPu9eh8cxwq9P6mO1Gr+GNn+1RsOOF+tNS xt2N+dNeu+CXpe9e+NR8+tZsru9lvNz5+td0rfBt+Np8sfF2yOO92tzZ0uHE2ODKufKCwvOSyvOk 2uvT4+rf4+3r3fTJ1vi47Pre9ff0MWAqGAAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsdEBQ5QculOQAABYJJREFUSMedln9UU2UYx5eICNas rj8C8wc0VGBcmVp3+KM0CGNAcfBXpCFwmOG00jY75I+pM9TQgVhHBLrFppQYYKabyBARdKDIsMZq TLjOgZONxh3IhmJ4eu/d2AbKOZy+f3++7/M+z/u+z/NSKKMSglBGLQSBY3lHeQnwmtHRiBQzAGHY L1/Do8BFmFGlN8hFsTAMM6NHdECkZiByXK9WmbAEewbwdGQE+lDxtZZfkWxcr1TrMR7swJ5ngKCb j/q7+/5el4AZ1UoVLoJn5FFGNkDU4v4r4t1/HWRK8XalUo8nhV7bTH1zRINPQf+TW7dy6jfywG6U SiOGhH+YdrllFTSCAWocaPgkp+DsmmxcfeeOGhchmwWVitzq8oKX7YZhfPfAFzklv+2KEhF8O85b uuNIpTYmvya/7QbpQKKG8zvEVX3XEamJ5GM/lZQI9lUu3qeQydouUQEx9Kih8wPWGz/cvM2UG++Q /E5JyandP29J0yhqZKX39vg8U6ABq9X64DYTG+SrJDmnijp0Wk2TQlaa+2DBR8P4J30Wa999Jqa3 8/X1VZJT5s4O0iArrbhBHR7AYrXed+zn9F3AX7lk/qmyUksacv9cD7ny1IdWYIiWOnjCcM+yXrB6 X3XmAS4ptnBIALPFuk5ksvP/kIaC/TtyBCsiuNwzZxsaGsqFXK6L4V+z5SDPVn8bDwwX2sydFZu+ ysjIOAl0TJghdDkDS9ePTBuf9B3gyRTaLCDp6qLyxzb195ShzhpVLECIAqnxpG/v2taXPLBYujp1 2j0N3b0PGxvQk+V5dUKnISZUZFQCnrehHqgK8CVWi7kLnAO3tbu3pbGx8GRZXh3XmcL7STi4n6bs ULGkisAl4suAB8dQfaz1YW9L+ZnzhahrhOtMTA3us3TpEYFATOBi8T0iA522orD1UW8ver5QmJdX 5jRsABtS6jFkk8ChW+SGtOfOtD7uPb0o7J2ULzOcSb+O4GplO8Y8d+LE54SSk5PjPiPW12qKdnpe TZ861t193LhxXscHQ8ySgveOR3/f1WVenUwoLi4uIE2nq9Y07fL0unh4ksd4Uulb7YZYnEj4PV1H Z2dXWhyhgABf34Uh/kGZXLeJV9OnTUtMTJz2kvugIUreXtuOzarW6nQdHZ1bAA1wX9+AOYGBmbvc 3H5P8XyB1JjjdgPToFTisQs0WiAd2MiWOSQOeP+Iva+5haW8COAxY8dOteewUaSv1UtDlzc1aUiP VhsTYMP96avzuW5uYRMBDtK+aA8AY2q1AQkJzFcomgiTRjGFwAP96fSgYP43bM8xXgD38DicYk85 wVRrPLqB7r9cVqMg9TFB+5M8IyvrQMpUL3eP8ZMuDvJr5KpaA7x9E52+sFQmk9XU1ESSND0I8POz +Py9W8MS3z3sKCkFNtSqpEuhYkYQPaaUsMhmk3RQcDAjZAV/27bUtVsJUVwMpiQK9FZxcFBEKVBu JI2kAR4SQotMTU2NfzucHe58PYgJ7AjcJ1YxIyIXKDKYEIPEabTFqfHxr6xko2yXOdNcKye6LMQp DuFnZWXNZjBImsBp3jPj4+euWskWDjGopGRbhpZdyOTz46cQ8HwaiXt7T5776qp5EJvrajCqRLY+ Ds08W7TWmzYoAp88mcXxgShctkvHQEz2CMT8+SBj83w7TOB+LM48CHQwoasBNvwhRZwji7X9EGfJ Ej8/v2VLWBzOPCpEQYVCEMHZyBBpM+YyWuDpsxaxAMpZyQKLg9W5aE9P2RsTJoQ78kgwNEvhwamf AKYxMXSpkA9EdlNU2FNXhoaHs9GnqP2JRmVjzXIEiU1CRGDcPzMpiQhAT5/WOSqF8MjvgQETRT9v dINGLERBZ+UO+VIQgkf8s6BClPI/9R8YkySeb+c1WwAAAABJRU5ErkJggg== " height="48" width="48" y="8" x="64"/> - <g id="g4035"> - <path id="path3214" d="m310.65,47.997c0,3.5699-2.894,6.4639-6.4634,6.4639-3.5698,0-6.4636-2.894-6.4636-6.4639,0-3.5697,2.8939-6.4634,6.4636-6.4634,3.5694,0,6.4634,2.8937,6.4634,6.4634z" fill-rule="nonzero" stroke="#39396c" stroke-miterlimit="4" stroke-width="1" fill="url(#radialGradient3654)"/> - <path id="path4348" opacity="0.42159382" d="m30.709,15.271a12.93,9.2934,0,1,1,-25.86,0,12.93,9.2934,0,1,1,25.86,0z" transform="matrix(0.278646,0,0,0.3333334,299.29562,40.168359)" fill="url(#radialGradient11220)"/> - <path id="path4144" d="m310.47,47.029l-0.17844,0.20211c-0.10937-0.12889-0.23216-0.23728-0.35686-0.35048l-0.27372,0.04028-0.25008-0.28269v0.34986l0.21426,0.16212,0.1426,0.1615,0.19058-0.21553c0.048,0.08985,0.0953,0.17971,0.14294,0.26956v0.26927l-0.21458,0.24238-0.39269,0.26956-0.2974,0.29678-0.19058-0.21619,0.0953-0.24238-0.19028-0.21553-0.32137-0.68691-0.27372-0.30954-0.0716,0.08059,0.10744,0.39079,0.20211,0.22896c0.11543,0.33322,0.22961,0.6517,0.38119,0.97022,0.23505,0,0.45664-0.02495,0.69008-0.05436v0.18868l-0.28557,0.7005-0.2619,0.29612-0.21426,0.45857v0.75404l0.0717,0.29677-0.11896,0.13432-0.26223,0.1618-0.27372,0.22896,0.2264,0.25584-0.30954,0.26989,0.0595,0.1746-0.46433,0.52573h-0.30922l-0.2619,0.1618h-0.16694v-0.21553l-0.071-0.43172c-0.0921-0.27054-0.18803-0.53916-0.28558-0.80777,0-0.19828,0.0118-0.39462,0.0237-0.59286l0.11929-0.26927-0.16694-0.32362,0.0122-0.44449-0.2264-0.25584,0.1132-0.37032-0.18419-0.20898h-0.3217l-0.10711-0.12119-0.32136,0.20227-0.13079-0.14854-0.29772,0.25597c-0.20211-0.22912-0.40454-0.45808-0.60695-0.68704l-0.23793-0.56601,0.21426-0.32297-0.11897-0.13462,0.26158-0.62007c0.21491-0.26734,0.43938-0.5238,0.66644-0.78121l0.40483-0.10777,0.45219-0.05374,0.30954,0.08092,0.44033,0.44416,0.15479-0.17493,0.21393-0.02685,0.40484,0.13462h0.30954l0.21426-0.18868,0.0953-0.13462-0.21459-0.13462-0.35719-0.02685c-0.0991-0.1375-0.19123-0.28204-0.30892-0.40421l-0.11929,0.05374-0.0477,0.35048-0.21425-0.24238-0.0473-0.26989-0.23793-0.18803h-0.0956l0.23823,0.26927-0.0953,0.24238-0.19029,0.05374,0.11897-0.24238-0.21459-0.10744-0.18995-0.21553-0.35752,0.08059-0.0473,0.10744-0.21425,0.13494-0.11897,0.29645-0.2974,0.14804-0.13111-0.14804h-0.14261v-0.4851l0.30955-0.1618h0.23793l-0.048-0.18835-0.18996-0.18868,0.32107-0.06749,0.17843-0.20178,0.14261-0.24271h0.26223l-0.0716-0.18835,0.16694-0.10777v0.21553l0.35686,0.08059,0.35686-0.29612,0.024-0.13494,0.30922-0.21537c-0.11193,0.01392-0.22385,0.02413-0.33322,0.0539v-0.24268l0.11896-0.26943h-0.11896l-0.26144,0.24238-0.0716,0.13478,0.0716,0.18884-0.1193,0.32297-0.19028-0.10777-0.16628-0.18835-0.26223,0.18835-0.0953-0.4309,0.45218-0.29628v-0.1618l0.28587-0.18852,0.45219-0.10793,0.30955,0.10793,0.57111,0.10777-0.1426,0.1615h-0.30955l0.30955,0.3233,0.23793-0.26927,0.0723-0.11847s0.91265,0.81799,1.4342,1.7128c0.52158,0.89507,0.76652,1.95,0.76652,2.1643z" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4152" d="m304.58,43.27-0.024,0.1615,0.16694,0.10777,0.28525-0.18852-0.14261-0.16167-0.19058,0.10793-0.095-0.02701" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4160" d="m304.84,42.166-0.61909-0.24255-0.71376,0.08075-0.88099,0.24238-0.16661,0.1618,0.54748,0.37703,0,0.21553-0.21426,0.21553,0.28587,0.56617,0.18996-0.10809,0.23855-0.37703c0.36774-0.11369,0.69745-0.24255,1.047-0.40421l0.28587-0.72735" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4168" d="m305.48,44.429-0.0953-0.24271-0.16694,0.05403,0.048,0.29612,0.21426-0.10744" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4176" d="m305.58,44.375-0.0476,0.32362,0.2619-0.05403,0.19028-0.18835-0.16661-0.1618c-0.056-0.14903-0.12024-0.28813-0.19028-0.43106h-0.14261v0.1615l0.095,0.10777v0.24238" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4184" d="m302.05,49.494-0.19058-0.37733-0.35702-0.08075-0.19042-0.51165-0.47599,0.05374-0.40454-0.29612-0.42868,0.37703,0,0.05947c-0.12967-0.03743-0.28907-0.04254-0.40454-0.11353l-0.0953-0.26927v-0.29645l-0.28557,0.02685c0.0238-0.18868,0.0475-0.37703,0.0715-0.56568h-0.16677l-0.16645,0.21553-0.16677,0.08059-0.23809-0.13432-0.0238-0.29645,0.0476-0.3233,0.35719-0.26927h0.28558l0.0475-0.1618,0.35702,0.08059,0.2619,0.32363,0.0477-0.53916,0.45232-0.37703,0.16661-0.40421,0.33322-0.13462,0.19041-0.26927,0.42835-0.08121,0.21442-0.32297h-0.64277l0.40467-0.18868h0.28542l0.40483-0.13494,0.0476-0.16118-0.14294-0.13494-0.16661-0.05403,0.0477-0.1615-0.11897-0.24238-0.28574,0.10744,0.0476-0.21537-0.33322-0.18868-0.26174,0.45775,0.0237,0.1618-0.26173,0.10809-0.16678,0.35015-0.0713-0.3233-0.45231-0.18868-0.0715-0.24238,0.59512-0.35048,0.2619-0.24238,0.0238-0.29628-0.14277-0.08091-0.19041-0.02701-0.11897,0.29645s-0.19906,0.039-0.25024,0.05164c-0.65364,0.60232-1.9743,1.9026-2.2812,4.3572,0.0122,0.05691,0.22241,0.38692,0.22241,0.38692l0.49983,0.29612,0.49983,0.13494,0.21442,0.26956,0.33306,0.24238,0.19042-0.02685,0.14277,0.06428v0.04349l-0.19029,0.51182-0.14293,0.21553,0.0476,0.10809-0.11896,0.40356,0.42851,0.78154,0.42834,0.37733,0.19058,0.26927-0.024,0.56601,0.14294,0.32297-0.14294,0.61974s-0.0112-0.0038,0.007,0.05819c0.0184,0.06205,0.76268,0.4752,0.81,0.44004,0.0471-0.03582,0.0875-0.06716,0.0875-0.06716l-0.0475-0.13432,0.19029-0.18868,0.0715-0.18868,0.30955-0.10809,0.23793-0.59286-0.0713-0.16117,0.16628-0.24238,0.35719-0.08121,0.19058-0.43106-0.0476-0.5385,0.28557-0.40421,0.0476-0.40421c-0.39079-0.19379-0.77837-0.39334-1.1662-0.59286" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4192" d="m301.53,43.378,0.23793,0.16167,0.19058,0,0-0.18852-0.23793-0.10777-0.19058,0.13462" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4200" d="m300.91,43.163-0.11913,0.29628,0.2381,0,0.11912-0.26943c0.10266-0.0726,0.20483-0.14565,0.30939-0.21553l0.23809,0.08091c0.15862,0.10777,0.31724,0.21553,0.47599,0.32313l0.23823-0.21537-0.26207-0.10777-0.11913-0.24255-0.45218-0.0539-0.0238-0.13478-0.21426,0.05403-0.0951,0.18855-0.11913-0.24255-0.0475,0.10777,0.0238,0.26943-0.19045,0.16176" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4228" d="m301.77,42.489,0.11913-0.1076,0.2381-0.0539c0.16307-0.07931,0.3268-0.13272,0.49983-0.18868l-0.095-0.16167-0.30731,0.04414-0.1452,0.1447-0.23937,0.03471-0.21281,0.09994-0.10345,0.05004-0.0632,0.08458,0.30921,0.05373" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4236" d="m302.17,45.049,0.14293-0.21553-0.21442-0.1615,0.0715,0.37703" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path3224" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m310.4,46.962l-0.17844,0.20211c-0.10937-0.12889-0.23216-0.23728-0.35686-0.35048l-0.27372,0.04028-0.25008-0.28269v0.34986l0.21426,0.16212,0.1426,0.1615,0.19058-0.21553c0.048,0.08985,0.0953,0.17971,0.14294,0.26956v0.26927l-0.21458,0.24238-0.39269,0.26956-0.2974,0.29678-0.19058-0.21619,0.0953-0.24238-0.19028-0.21553-0.32137-0.68691-0.27372-0.30954-0.0716,0.08059,0.10744,0.39079,0.20211,0.22896c0.11543,0.33322,0.22961,0.6517,0.38119,0.97022,0.23505,0,0.45664-0.02495,0.69008-0.05436v0.18868l-0.28557,0.7005-0.2619,0.29612-0.21426,0.45857v0.75404l0.0717,0.29677-0.11896,0.13432-0.26223,0.1618-0.27372,0.22896,0.2264,0.25584-0.30954,0.26989,0.0595,0.1746-0.46433,0.52573h-0.30922l-0.2619,0.1618h-0.16694v-0.21553l-0.071-0.43172c-0.0921-0.27054-0.18803-0.53916-0.28558-0.80777,0-0.19828,0.0118-0.39462,0.0237-0.59286l0.11929-0.26927-0.16694-0.32362,0.0122-0.44449-0.2264-0.25584,0.1132-0.37032-0.18419-0.20898h-0.3217l-0.10711-0.12119-0.32136,0.20227-0.13079-0.14854-0.29772,0.25597c-0.20211-0.22912-0.40454-0.45808-0.60695-0.68704l-0.23793-0.56601,0.21426-0.32297-0.11897-0.13462,0.26158-0.62007c0.21491-0.26734,0.43938-0.5238,0.66644-0.78121l0.40483-0.10777,0.45219-0.05374,0.30954,0.08091,0.44033,0.44416,0.15479-0.17493,0.21393-0.02685,0.40484,0.13462h0.30954l0.21426-0.18868,0.0953-0.13462-0.21459-0.13462-0.35719-0.02685c-0.0991-0.1375-0.19123-0.28204-0.30892-0.40421l-0.11929,0.05374-0.0477,0.35048-0.21425-0.24238-0.0473-0.26989-0.23793-0.18803h-0.0956l0.23823,0.26927-0.0953,0.24238-0.19029,0.05374,0.11897-0.24238-0.21459-0.10744-0.18995-0.21553-0.35752,0.08059-0.0473,0.10744-0.21425,0.13494-0.11897,0.29645-0.2974,0.14804-0.13111-0.14804h-0.14261v-0.4851l0.30955-0.1618h0.23793l-0.048-0.18835-0.18996-0.18868,0.32107-0.06749,0.17843-0.20178,0.14261-0.24271h0.26223l-0.0716-0.18835,0.16694-0.10777v0.21553l0.35686,0.08059,0.35686-0.29612,0.024-0.13494,0.30922-0.21537c-0.11193,0.01392-0.22385,0.02413-0.33322,0.0539v-0.24268l0.11896-0.26943h-0.11896l-0.26144,0.24238-0.0717,0.13478,0.0717,0.18884-0.1193,0.32297-0.19028-0.10777-0.16628-0.18835-0.26223,0.18835-0.0953-0.4309,0.45218-0.29628v-0.1618l0.28587-0.18852,0.45219-0.10793,0.30955,0.10793,0.57111,0.10777-0.1426,0.1615h-0.30955l0.30955,0.3233,0.23793-0.26927,0.0723-0.11847s0.91265,0.81799,1.4342,1.7128c0.52158,0.89507,0.76652,1.95,0.76652,2.1643z"/> - <path id="path3232" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m304.51,43.203-0.024,0.1615,0.16694,0.10777,0.28525-0.18852-0.14261-0.16167-0.19058,0.10793-0.095-0.02701"/> - <path id="path3240" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m304.77,42.099-0.61909-0.24255-0.71376,0.08075-0.88099,0.24238-0.16661,0.1618,0.54748,0.37703,0,0.21553-0.21426,0.21553,0.28587,0.56617,0.18996-0.10809,0.23855-0.37703c0.36774-0.11369,0.69745-0.24255,1.047-0.40421l0.28587-0.72735"/> - <path id="path3248" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m305.41,44.362-0.0953-0.24271-0.16694,0.05403,0.048,0.29612,0.21426-0.10744"/> - <path id="path3256" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m305.51,44.308-0.0476,0.32362,0.2619-0.05403,0.19028-0.18835-0.16661-0.1618c-0.056-0.14903-0.12024-0.28813-0.19028-0.43106h-0.14261v0.1615l0.095,0.10777v0.24238"/> - <path id="path3264" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m301.99,49.427-0.19058-0.37733-0.35702-0.08075-0.19042-0.51165-0.47599,0.05374-0.40454-0.29612-0.42868,0.37703,0,0.05947c-0.12967-0.03743-0.28907-0.04254-0.40454-0.11353l-0.0953-0.26927v-0.29645l-0.28557,0.02685c0.0238-0.18868,0.0475-0.37703,0.0715-0.56568h-0.16677l-0.16645,0.21553-0.16677,0.08059-0.23809-0.13432-0.0238-0.29645,0.0476-0.3233,0.35719-0.26927h0.28558l0.0475-0.1618,0.35702,0.08059,0.2619,0.32363,0.0477-0.53916,0.45232-0.37703,0.16661-0.40421,0.33322-0.13462,0.19041-0.26927,0.42835-0.08121,0.21442-0.32297h-0.64277l0.40467-0.18868h0.28542l0.40483-0.13494,0.0476-0.16118-0.14294-0.13494-0.16661-0.05403,0.0477-0.1615-0.11897-0.24238-0.28574,0.10744,0.0476-0.21537-0.33322-0.18868-0.26174,0.45775,0.0237,0.1618-0.26173,0.10809-0.16678,0.35015-0.0713-0.3233-0.45231-0.18868-0.0715-0.24238,0.59512-0.35048,0.2619-0.24238,0.0238-0.29628-0.14277-0.08091-0.19041-0.02701-0.11897,0.29645s-0.19906,0.039-0.25024,0.05164c-0.65364,0.60232-1.9743,1.9026-2.2812,4.3572,0.0122,0.05691,0.22241,0.38692,0.22241,0.38692l0.49983,0.29612,0.49983,0.13494,0.21442,0.26956,0.33306,0.24238,0.19042-0.02685,0.14277,0.06428v0.04349l-0.19029,0.51182-0.14293,0.21553,0.0476,0.10809-0.11896,0.40356,0.42851,0.78154,0.42834,0.37733,0.19058,0.26927-0.024,0.56601,0.14294,0.32297-0.14294,0.61974s-0.0112-0.0038,0.007,0.05819c0.0184,0.06205,0.76268,0.4752,0.81,0.44004,0.0471-0.03582,0.0875-0.06716,0.0875-0.06716l-0.0475-0.13432,0.19029-0.18868,0.0715-0.18868,0.30955-0.10809,0.23793-0.59286-0.0713-0.16117,0.16628-0.24238,0.35719-0.08121,0.19058-0.43106-0.0476-0.5385,0.28557-0.40421,0.0476-0.40421c-0.39079-0.19379-0.77837-0.39334-1.1662-0.59286"/> - <path id="path3272" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m301.46,43.311,0.23793,0.16167,0.19058,0,0-0.18852-0.23793-0.10777-0.19058,0.13462"/> - <path id="path3280" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m300.84,43.095-0.11913,0.29628,0.2381,0,0.11912-0.26943c0.10266-0.0726,0.20483-0.14565,0.30939-0.21553l0.23809,0.08091c0.15862,0.10777,0.31724,0.21553,0.47599,0.32313l0.23823-0.21537-0.26207-0.10777-0.11913-0.24255-0.45218-0.0539-0.0238-0.13478-0.21426,0.05403-0.0951,0.18855-0.11913-0.24255-0.0475,0.10777,0.0238,0.26943-0.19045,0.16176"/> - <path id="path3308" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m301.7,42.422,0.11913-0.1076,0.2381-0.0539c0.16307-0.07931,0.3268-0.13272,0.49983-0.18868l-0.095-0.16167-0.30731,0.04414-0.1452,0.1447-0.23937,0.03471-0.21281,0.09994-0.10345,0.05004-0.0632,0.08458,0.30921,0.05374"/> - <path id="path3316" fill-rule="nonzero" fill="url(#radialGradient3960)" d="m302.11,44.981,0.14293-0.21553-0.21442-0.1615,0.0715,0.37703"/> - <path id="path11859" stroke-linejoin="miter" d="M27.289,16a11.289,11.631,0,1,1,-22.578,0,11.289,11.631,0,1,1,22.578,0z" transform="matrix(0.5,0,0,0.5,296.18975,39.997088)" stroke="url(#radialGradient11866)" stroke-linecap="butt" stroke-width="2" fill="none"/> - <path id="path10782" stroke-linejoin="miter" d="m310.5,43.685s0.35355-0.73236,0.31988-1.5236c-0.0337-0.79129-0.50508-1.1028-1.5994-1.0438-1.0943,0.05893-3.858,1.6316-6.7259,4.7646-1.8461,2.0166-4.1899,4.3095-4.4862,7.0872-0.28572,2.6783,2.4043,1.8555,4.072,1.1586l0.47679,0.10392c-0.59279,0.46115-2.3525,1.6981-3.8675,1.4319-2.1415-0.41082-2.2366-2.6562-1.7915-4.4235,0.79175-2.5505,2.3368-4.7337,4.1467-6.6575,1.5536-1.6514,2.7526-2.4152,4.4608-3.3272,1.7297-0.92344,5.1235-1.7177,5.5585,0.60278-0.0168,0.95964-0.43773,1.9361-0.43773,1.9361l-0.12627-0.10943z" fill-rule="evenodd" stroke="#9e5c00" stroke-linecap="butt" stroke-width="0.5" fill="url(#radialGradient3567)"/> - <path id="path11071" stroke-linejoin="miter" style="stroke-dasharray:none;" d="M36.781,2.1875c-2.672,0.3469-5.547,1.2367-7.562,2.3125-5.075,2.7091-8.47,4.87-13.031,9.719-5.338,5.674-9.8067,12.068-12.094,19.437-0.6092,2.466-0.8123,5.244-0.2188,7.344,0.5323,1.884,1.5672,3.195,3.6875,3.844-0.6668-0.29-1.2879-0.715-1.7813-1.313-1.0369-1.255-1.4261-3.044-1.1874-5.281,0.9646-9.043,8.3472-16.09,13.844-22.094,4.3764-4.7807,8.6732-8.3661,12.344-10.812,2.3363-1.5571,4.2588-2.5208,6-3.1562zm-28.75,42.812c0.11317,0.02677,0.19335,0.07047,0.3125,0.09375,0.00967,0.0017,0.02156-0.0016,0.03125,0,0.038761,0.0066,0.085889-0.0057,0.125,0-0.1564-0.039-0.316-0.043-0.4688-0.094z" stroke-opacity="0.41975307" transform="matrix(0.3333334,0,0,0.3333334,295.97774,40.120533)" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1.49999988" fill="none"/> - </g> - <rect id="icon:16-32" height="16" width="16" y="40" x="296" fill="none"/> - <g id="g4570"> - <path id="path4112" d="m45.053,38.909a20.203,7.4751,0,1,1,-40.406,0,20.203,7.4751,0,1,1,40.406,0z" transform="matrix(0.6666667,0,0,0.8288293,176,17.488444)" fill="url(#radialGradient4120)"/> - <path id="path3214-5" d="m205.31,39.994c0,7.1398-5.7881,12.928-12.927,12.928-7.1395,0-12.927-5.7881-12.927-12.928,0-7.1395,5.7878-12.927,12.927-12.927,7.1388,0,12.927,5.7874,12.927,12.927z" fill-rule="nonzero" stroke="#39396c" stroke-miterlimit="4" stroke-width="1" fill="url(#radialGradient4565)"/> - <path id="path4348-3" opacity="0.42159382" d="m30.709,15.271a12.93,9.2934,0,1,1,-25.86,0,12.93,9.2934,0,1,1,25.86,0z" transform="matrix(0.557292,0,0,0.6666667,182.59125,24.336717)" fill="url(#radialGradient11220)"/> - <path id="path4144-8" d="m204.94,38.058l-0.35686,0.40421c-0.21874-0.25777-0.46434-0.47455-0.71373-0.70095l-0.54744,0.08055-0.50016-0.56539v0.69971l0.42851,0.32425,0.28522,0.323,0.38116-0.43106c0.0959,0.17971,0.19058,0.35942,0.28587,0.53912v0.53854l-0.42917,0.48477-0.78537,0.53912-0.59479,0.59355-0.38116-0.43237,0.19058-0.48477-0.38057-0.43106-0.64274-1.3738-0.54744-0.61909-0.14329,0.16117,0.21487,0.78157,0.40422,0.45792c0.23085,0.66644,0.45922,1.3034,0.76238,1.9404,0.4701,0,0.91328-0.0499,1.3802-0.10872v0.37736l-0.57115,1.401-0.5238,0.59224-0.42851,0.91714v1.5081l0.14329,0.59355-0.23793,0.26865-0.52445,0.32359-0.54745,0.45792,0.45281,0.51168-0.61909,0.53978,0.11893,0.3492-0.92867,1.0515h-0.61843l-0.5238,0.32359h-0.33388v-0.43106l-0.14198-0.86344c-0.18423-0.54109-0.37605-1.0783-0.57115-1.6155,0-0.39655,0.0236-0.78924,0.0473-1.1857l0.23858-0.53854-0.33387-0.64725,0.0243-0.88898-0.45281-0.51168,0.2264-0.74064-0.36838-0.41797h-0.64339l-0.21423-0.24238-0.64273,0.40454-0.26157-0.29707-0.59545,0.51195c-0.40421-0.45824-0.80908-0.91616-1.2139-1.3741l-0.47586-1.132,0.42851-0.64594-0.23793-0.26924,0.52314-1.2401c0.42982-0.53467,0.87877-1.0476,1.3329-1.5624l0.80968-0.21553,0.90437-0.10747,0.61909,0.16183,0.88066,0.88833,0.30958-0.34986,0.42785-0.0537,0.80967,0.26924h0.61909l0.42851-0.37736,0.19058-0.26924-0.42916-0.26924-0.71438-0.0537c-0.19824-0.275-0.38247-0.56408-0.61785-0.80843l-0.23858,0.10747-0.0953,0.70095-0.42851-0.48477-0.0946-0.53978-0.47586-0.37605h-0.19124l0.47645,0.53854-0.19058,0.48477-0.38057,0.10747,0.23793-0.48477-0.42916-0.21488-0.37992-0.43106-0.71504,0.16118-0.0946,0.21488-0.42851,0.26989-0.23793,0.59289-0.59479,0.29609-0.26223-0.29609h-0.28521v-0.97019l0.61909-0.32359h0.47586l-0.096-0.37671-0.37992-0.37736,0.64215-0.13498,0.35686-0.40356,0.28521-0.48542h0.52446l-0.1433-0.37671,0.33388-0.21553v0.43106l0.71373,0.16117,0.71372-0.59224,0.0479-0.26989,0.61844-0.43074c-0.22385,0.02783-0.4477,0.04827-0.66644,0.1078v-0.48536l0.23793-0.53886h-0.23793l-0.52289,0.48477-0.14329,0.26956,0.14329,0.37769-0.23858,0.64594-0.38057-0.21553-0.33257-0.37671-0.52446,0.37671-0.19057-0.8618,0.90437-0.59257v-0.32359l0.57174-0.37703,0.90437-0.21586,0.61909,0.21586,1.1422,0.21553-0.28521,0.323h-0.61909l0.61909,0.6466,0.47586-0.53854,0.14454-0.23695s1.8253,1.636,2.8685,3.4255c1.0431,1.7901,1.533,3.9001,1.533,4.3286z" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4152-8" d="m193.15,30.541-0.0479,0.323,0.33388,0.21553,0.57049-0.37703-0.28521-0.32333-0.38116,0.21586-0.18993-0.05403" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4160-3" d="m193.68,28.332-1.2382-0.4851-1.4275,0.1615-1.762,0.48477-0.33322,0.32359,1.095,0.75407,0,0.43106-0.42851,0.43106,0.57174,1.1323,0.37991-0.21619,0.47711-0.75407c0.73547-0.22739,1.3949-0.4851,2.094-0.80843l0.57174-1.4547" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4168-1" d="m194.96,32.858-0.19058-0.48542-0.33387,0.10806,0.0959,0.59224,0.42851-0.21488" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4176-8" d="m195.15,32.75-0.0953,0.64725,0.5238-0.10806,0.38057-0.37671-0.33322-0.32359c-0.11193-0.29805-0.24048-0.57626-0.38057-0.86213h-0.28522v0.323l0.18993,0.21553v0.48477" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4184-9" d="m188.11,42.988-0.38116-0.75466-0.71406-0.1615-0.38083-1.0233-0.95198,0.10747-0.80908-0.59224-0.85735,0.75407,0,0.11893c-0.25935-0.07486-0.57816-0.08507-0.80908-0.22706l-0.19058-0.53854v-0.59289l-0.57115,0.0537c0.0477-0.37736,0.095-0.75407,0.14297-1.1314h-0.33355l-0.33289,0.43106-0.33355,0.16117-0.47619-0.26865-0.0477-0.59289,0.0953-0.6466,0.71438-0.53854h0.57115l0.095-0.32359,0.71405,0.16118,0.5238,0.64725,0.0953-1.0783,0.90463-0.75407,0.33322-0.80843,0.66644-0.26924,0.38083-0.53854,0.8567-0.16242,0.42883-0.64594h-1.2855l0.80935-0.37736h0.57082l0.80967-0.26989,0.0953-0.32235-0.28587-0.26989-0.33322-0.10806,0.0953-0.323-0.23793-0.48477-0.57148,0.21488,0.0953-0.43074-0.66644-0.37736-0.52347,0.9155,0.0473,0.32359-0.52347,0.21619-0.33355,0.7003-0.14264-0.6466-0.90464-0.37736-0.14296-0.48477,1.1902-0.70096,0.5238-0.48477,0.0477-0.59257-0.28555-0.16183-0.38083-0.05403-0.23793,0.59289s-0.39812,0.078-0.50048,0.10328c-1.3073,1.2046-3.9487,3.8051-4.5623,8.7144,0.0243,0.11382,0.44482,0.77385,0.44482,0.77385l0.99966,0.59224,0.99966,0.26989,0.42883,0.53913,0.66612,0.48477,0.38083-0.0537,0.28554,0.12856v0.08697l-0.38057,1.0236-0.28587,0.43106,0.0953,0.21619-0.23793,0.80712,0.85702,1.5631,0.8567,0.75466,0.38116,0.53854-0.0479,1.132,0.28587,0.64594-0.28587,1.2395s-0.0224-0.0077,0.0141,0.11638c0.0368,0.12411,1.5254,0.95041,1.62,0.88007,0.0943-0.07165,0.17493-0.13432,0.17493-0.13432l-0.095-0.26864,0.38057-0.37736,0.14297-0.37736,0.61909-0.21619,0.47586-1.1857-0.14264-0.32235,0.33256-0.48477,0.71438-0.16242,0.38116-0.86213-0.0953-1.077,0.57115-0.80843,0.0953-0.80843c-0.78157-0.38758-1.5567-0.78668-2.3325-1.1857" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4192-6" d="m187.06,30.756,0.47587,0.32333,0.38116,0,0-0.37703-0.47587-0.21553-0.38116,0.26924" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4200-4" d="m185.82,30.325-0.23826,0.59257,0.47619,0,0.23826-0.53886c0.20531-0.14519,0.40965-0.2913,0.61876-0.43106l0.47619,0.16183c0.31724,0.21553,0.63448,0.43106,0.95198,0.64627l0.47645-0.43074-0.52413-0.21553-0.23825-0.48509-0.90438-0.1078-0.0477-0.26956-0.42851,0.10806-0.19019,0.3771-0.23826-0.4851-0.095,0.21553,0.0477,0.53886-0.3809,0.32353" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4228-3" d="m187.54,28.978,0.23825-0.2152,0.47619-0.1078c0.32615-0.15862,0.65361-0.26544,0.99966-0.37736l-0.18992-0.32333-0.61464,0.08828-0.29039,0.28941-0.47874,0.06942-0.42563,0.19988-0.20689,0.10007-0.12633,0.16916,0.61844,0.10747" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4236-3" d="m188.35,34.097,0.28587-0.43106-0.42884-0.323,0.14297,0.75407" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path3224-3" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m204.81,37.923l-0.35686,0.40421c-0.21874-0.25777-0.46433-0.47455-0.71372-0.70096l-0.54745,0.08055-0.50016-0.56539v0.69971l0.42851,0.32425,0.28522,0.323,0.38116-0.43106c0.0959,0.17971,0.19058,0.35942,0.28587,0.53912v0.53854l-0.42917,0.48477-0.78537,0.53912-0.59479,0.59355-0.38116-0.43238,0.19058-0.48477-0.38057-0.43106-0.64273-1.3738-0.54745-0.61909-0.14329,0.16118,0.21488,0.78157,0.40421,0.45792c0.23086,0.66644,0.45922,1.3034,0.76238,1.9404,0.4701,0,0.91328-0.0499,1.3802-0.10872v0.37736l-0.57115,1.401-0.5238,0.59224-0.42851,0.91714v1.5081l0.14329,0.59355-0.23793,0.26865-0.52445,0.32359-0.54744,0.45792,0.4528,0.51168-0.61909,0.53978,0.11894,0.3492-0.92867,1.0515h-0.61844l-0.5238,0.32359h-0.33387v-0.43106l-0.14199-0.86344c-0.18423-0.54109-0.37605-1.0783-0.57115-1.6155,0-0.39655,0.0236-0.78924,0.0474-1.1857l0.23859-0.53854-0.33388-0.64725,0.0243-0.88898-0.45281-0.51168,0.22641-0.74064-0.36839-0.41797h-0.64339l-0.21422-0.24238-0.64273,0.40454-0.26158-0.29707-0.59545,0.51195c-0.40421-0.45824-0.80908-0.91616-1.2139-1.3741l-0.47586-1.132,0.42851-0.64594-0.23793-0.26924,0.52314-1.2401c0.42982-0.53467,0.87877-1.0476,1.3329-1.5624l0.80967-0.21553,0.90437-0.10747,0.61909,0.16183,0.88066,0.88832,0.30958-0.34986,0.42785-0.0537,0.80967,0.26924h0.61909l0.42851-0.37736,0.19058-0.26924-0.42916-0.26924-0.71438-0.0537c-0.19824-0.275-0.38247-0.56408-0.61785-0.80843l-0.23858,0.10747-0.0953,0.70096-0.42851-0.48477-0.0946-0.53978-0.47586-0.37605h-0.19124l0.47645,0.53854-0.19058,0.48477-0.38057,0.10747,0.23793-0.48477-0.42916-0.21488-0.37992-0.43106-0.71504,0.16117-0.0946,0.21488-0.4285,0.26989-0.23793,0.59289-0.5948,0.29609-0.26223-0.29609h-0.28521v-0.97019l0.61909-0.32359h0.47586l-0.0959-0.37671-0.37992-0.37736,0.64215-0.13498,0.35686-0.40356,0.28521-0.48542h0.52446l-0.1433-0.37671,0.33388-0.21553v0.43106l0.71373,0.16118,0.71372-0.59224,0.0479-0.26989,0.61844-0.43074c-0.22385,0.02783-0.4477,0.04827-0.66644,0.1078v-0.48536l0.23793-0.53886h-0.23793l-0.52289,0.48477-0.14329,0.26956,0.14329,0.37769-0.23858,0.64594-0.38057-0.21553-0.33257-0.37671-0.52445,0.37671-0.19058-0.8618,0.90437-0.59257v-0.32359l0.57174-0.37703,0.90437-0.21586,0.61909,0.21586,1.1422,0.21553-0.28521,0.323h-0.61909l0.61909,0.6466,0.47586-0.53854,0.14454-0.23695s1.8253,1.636,2.8685,3.4255c1.0431,1.7901,1.533,3.9001,1.533,4.3286z"/> - <path id="path3232-8" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m193.02,30.406-0.0479,0.323,0.33387,0.21553,0.5705-0.37703-0.28522-0.32333-0.38116,0.21586-0.18992-0.05403"/> - <path id="path3240-6" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m193.54,28.197-1.2382-0.48509-1.4275,0.1615-1.762,0.48477-0.33322,0.32359,1.095,0.75407,0,0.43106-0.42851,0.43106,0.57174,1.1323,0.37992-0.21619,0.4771-0.75407c0.73547-0.22739,1.3949-0.4851,2.094-0.80843l0.57174-1.4547"/> - <path id="path3248-0" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m194.83,32.724-0.19058-0.48542-0.33388,0.10806,0.0959,0.59224,0.42851-0.21488"/> - <path id="path3256-4" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m195.02,32.615-0.0953,0.64725,0.5238-0.10806,0.38057-0.37671-0.33322-0.32359c-0.11192-0.29805-0.24048-0.57626-0.38057-0.86213h-0.28521v0.323l0.18992,0.21553v0.48477"/> - <path id="path3264-8" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m187.97,42.854-0.38116-0.75466-0.71405-0.1615-0.38084-1.0233-0.95198,0.10747-0.80908-0.59224-0.85735,0.75407,0,0.11893c-0.25934-0.07486-0.57816-0.08507-0.80908-0.22706l-0.19058-0.53854v-0.59289l-0.57115,0.0537c0.0477-0.37736,0.095-0.75407,0.14297-1.1314h-0.33355l-0.33289,0.43106-0.33355,0.16118-0.47619-0.26865-0.0477-0.59289,0.0953-0.6466,0.71438-0.53854h0.57115l0.095-0.32359,0.71405,0.16117,0.5238,0.64725,0.0953-1.0783,0.90463-0.75407,0.33322-0.80843,0.66644-0.26924,0.38084-0.53854,0.85669-0.16242,0.42884-0.64594h-1.2855l0.80934-0.37736h0.57082l0.80967-0.26989,0.0953-0.32235-0.28587-0.26989-0.33322-0.10806,0.0953-0.323-0.23793-0.48477-0.57148,0.21488,0.0953-0.43074-0.66644-0.37736-0.52347,0.9155,0.0473,0.32359-0.52347,0.21619-0.33355,0.7003-0.14264-0.6466-0.90463-0.37736-0.14297-0.48477,1.1902-0.70095,0.5238-0.48477,0.0477-0.59257-0.28554-0.16183-0.38084-0.05403-0.23793,0.59289s-0.39812,0.078-0.50048,0.10328c-1.3073,1.2046-3.9487,3.8051-4.5623,8.7144,0.0243,0.11382,0.44482,0.77385,0.44482,0.77385l0.99966,0.59224,0.99966,0.26989,0.42884,0.53912,0.66611,0.48477,0.38083-0.0537,0.28555,0.12856v0.08697l-0.38058,1.0236-0.28587,0.43106,0.0953,0.21619-0.23793,0.80712,0.85703,1.5631,0.85669,0.75466,0.38116,0.53854-0.0479,1.132,0.28587,0.64594-0.28587,1.2395s-0.0224-0.0077,0.0141,0.11638c0.0368,0.12411,1.5254,0.95041,1.62,0.88007,0.0943-0.07165,0.17493-0.13432,0.17493-0.13432l-0.095-0.26865,0.38057-0.37736,0.14297-0.37736,0.61909-0.21619,0.47586-1.1857-0.14264-0.32235,0.33257-0.48477,0.71438-0.16242,0.38116-0.86213-0.0953-1.077,0.57115-0.80843,0.0953-0.80843c-0.78158-0.38758-1.5567-0.78668-2.3325-1.1857"/> - <path id="path3272-8" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m186.93,30.621,0.47586,0.32333,0.38116,0,0-0.37703-0.47586-0.21553-0.38116,0.26924"/> - <path id="path3280-8" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m185.69,30.191-0.23825,0.59257,0.47618,0,0.23826-0.53886c0.20532-0.14519,0.40965-0.29131,0.61876-0.43106l0.47619,0.16183c0.31724,0.21553,0.63448,0.43106,0.95198,0.64627l0.47645-0.43074-0.52412-0.21553-0.23826-0.4851-0.90437-0.1078-0.0477-0.26956-0.42851,0.10806-0.19019,0.3771-0.23825-0.4851-0.095,0.21553,0.0477,0.53886-0.3809,0.32353"/> - <path id="path3308-9" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m187.4,28.843,0.23826-0.2152,0.47618-0.1078c0.32615-0.15862,0.65361-0.26544,0.99966-0.37736l-0.18992-0.32333-0.61464,0.08828-0.29039,0.28941-0.47874,0.06942-0.42563,0.19988-0.20688,0.10007-0.12634,0.16916,0.61844,0.10747"/> - <path id="path3316-7" fill-rule="nonzero" fill="url(#radialGradient4508)" d="m188.21,33.963,0.28587-0.43106-0.42884-0.323,0.14297,0.75407"/> - <path id="path11859-7" stroke-linejoin="miter" d="M28,16a12,12,0,1,1,-24,0,12,12,0,1,1,24,0z" transform="translate(176.37951,23.994176)" stroke="url(#radialGradient11866)" stroke-linecap="butt" stroke-width="1px" fill="none"/> - <path id="path10782-6" stroke-linejoin="miter" d="m205.01,31.369s0.70711-1.4647,0.63977-3.0473c-0.0673-1.5826-1.0102-2.2055-3.1988-2.0876-2.1887,0.11785-7.7159,3.2633-13.452,9.5291-3.6922,4.0333-8.3798,8.619-8.9724,14.174-0.57144,5.3567,4.8085,3.711,8.1439,2.3172l0.95357,0.20785c-1.1856,0.9223-4.7051,3.3961-7.7349,2.8638-4.2831-0.82164-4.4732-5.3125-3.5831-8.8471,1.5835-5.101,4.6737-9.4675,8.2933-13.315,3.1072-3.3028,5.5051-4.8305,8.9215-6.6544,3.4594-1.8469,10.247-3.4354,11.117,1.2056-0.0337,1.9193-0.87547,3.8723-0.87547,3.8723l-0.25254-0.21887z" fill-rule="evenodd" stroke="#9e5c00" stroke-linecap="butt" stroke-width="1" fill="url(#radialGradient4504)"/> - <path id="path11071-4" stroke-linejoin="miter" style="stroke-dasharray:none;" d="M36.781,2.1875c-2.672,0.3469-5.547,1.2367-7.562,2.3125-5.075,2.7091-8.47,4.87-13.031,9.719-5.338,5.674-9.8067,12.068-12.094,19.437-0.6092,2.466-0.8123,5.244-0.2188,7.344,0.5323,1.884,1.5672,3.195,3.6875,3.844-0.6668-0.29-1.2879-0.715-1.7813-1.313-1.0369-1.255-1.4261-3.044-1.1874-5.281,0.9646-9.043,8.3472-16.09,13.844-22.094,4.3764-4.7807,8.6732-8.3661,12.344-10.812,2.3363-1.5571,4.2588-2.5208,6-3.1562zm-28.75,42.812c0.11317,0.02677,0.19335,0.07047,0.3125,0.09375,0.00967,0.0017,0.02156-0.0016,0.03125,0,0.038761,0.0066,0.085889-0.0057,0.125,0-0.1564-0.039-0.316-0.043-0.4688-0.094z" stroke-opacity="0.41975307" transform="matrix(0.6666667,0,0,0.6666667,176.05732,24.347259)" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1.49999988" fill="none"/> - <path id="path3420" opacity="0.2" stroke-linejoin="round" style="stroke-dasharray:none;" d="m27.438,11a4.4375,2.1843,0,1,1,-8.875,0,4.4375,2.1843,0,1,1,8.875,0z" transform="matrix(0.8545644,0,0,0.6265419,182.69443,46.657668)" filter="url(#filter3436)" stroke="#000" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.61406273" fill="#000"/> - <path id="path12255" opacity="0.07000002" d="m52,33.188a14.625,3.3125,0,1,1,-29.25,0,14.625,3.3125,0,1,1,29.25,0z" transform="matrix(0.3155237,0,0,0.3449497,189.19969,30.654564)" fill="url(#radialGradient4426)"/> - <path id="path12257" d="m205.38,33.647c-0.38783-0.76467-7.3688-0.76467-7.7566,0,0,1.147-1.1635,4.588-1.1635,7.6467s3.8783,4.9704,5.0418,4.9704,5.0418-1.9117,5.0418-4.9704-1.1635-6.4997-1.1635-7.6467z" fill-rule="evenodd" fill="url(#radialGradient4498)"/> - <path id="path12259" stroke-linejoin="round" style="stroke-dasharray:none;" d="m27.161,11a4.1607,1.4187,0,1,1,-8.3213,0,4.1607,1.4187,0,1,1,8.3213,0z" transform="matrix(0.9613848,0,0,0.7048595,179.38815,26.777745)" stroke="#919191" stroke-linecap="round" stroke-miterlimit="0" stroke-width="1.21478689" fill="none"/> - <path id="path12262" stroke-linejoin="round" style="stroke-dasharray:none;" d="m27.438,11a4.4375,2.1843,0,1,1,-8.875,0,4.4375,2.1843,0,1,1,8.875,0z" transform="matrix(1.012819,0,0,0.6841522,178.43901,45.474326)" stroke="#888a85" stroke-linecap="round" stroke-miterlimit="0" stroke-width="1.21478689" fill="url(#linearGradient4727)"/> - <path id="path12264" stroke-linejoin="round" style="stroke-dasharray:none;" d="m26.718,11a3.718,1.5862,0,1,1,-7.436,0,3.718,1.5862,0,1,1,7.436,0z" transform="matrix(0.9670244,0,0,0.5702668,179.48644,46.727065)" stroke="url(#linearGradient4729)" stroke-linecap="round" stroke-miterlimit="0" stroke-width="1.00995839" fill="none"/> - <path id="path12266" stroke-linejoin="round" d="m8,43.468,2.5-1,2.4688,0.125-4.9687,0.875z" fill-rule="evenodd" transform="matrix(0.7756645,0,0,0.7646744,195.29468,19.761412)" filter="url(#filter3391)" stroke="url(#linearGradient4733)" stroke-linecap="round" stroke-width="0.64922434px" fill="url(#linearGradient4731)"/> - <path id="path12268" stroke-linejoin="miter" d="m199.56,45.5c0.77566,0.76467,1.5513,1.9117,1.5513,6.1174,0,0.76468,0.1049,1.147,0.38783,1.147,0.28292,0,0.38783-0.38234,0.38783-1.147,0-4.2057,0.77567-5.3527,1.5513-6.1174" fill-rule="evenodd" stroke="#888a85" stroke-linecap="round" stroke-width="1" fill="url(#linearGradient4491)"/> - <path id="path12270" d="m196.5,40.05c0,4.5,3.8365,6.2147,5,6.2147s5-1.7147,5-6.2147" fill-rule="evenodd" fill="url(#radialGradient4488)"/> - <path id="path12272" stroke-linejoin="round" style="stroke-dasharray:none;" d="m27.941,11a4.9408,1.6273,0,1,1,-9.8816,0,4.9408,1.6273,0,1,1,9.8816,0z" transform="matrix(0.9613848,0,0,0.7048595,179.38815,32.393557)" stroke="url(#linearGradient4444)" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.61406273" fill="url(#radialGradient4442)"/> - <path id="path9912" stroke-linejoin="miter" d="M15.375,3.8125,7.6875,8.8438c-0.32309,1.5166,0.41911,2.7902,1.4375,3.7188,0.51582,0.4703,1.1023,0.87123,1.625,1.125s0.99518,0.375,1.25,0.375c0.25483,0,0.73952-0.14486,1.2812-0.40625,0.54173-0.26139,1.1572-0.62499,1.6875-1.125,1.0606-1,1.8238-2.4185,1.3438-4.2188a0.19227,0.19227,0,0,1,0,-0.03125c-15.611-5.6946-15.867-6.7056-16.313-8.2815z" transform="translate(189.54787,31.496011)" stroke="url(#linearGradient4568)" stroke-linecap="round" stroke-width="0.49999997px" fill="none"/> - <path id="path12275" d="m198.67,35.531,2.327,0s-1.1635,4.1065-1.1635,6.0182c0,1.147,0.77567,1.9117,0.38783,2.294-0.38783,0.38234-2.327-1.1092-2.327-3.0587,0-0.76468,0.38783-2.5772,0.77567-5.2535z" fill-rule="evenodd" fill="url(#linearGradient4483)"/> - <path id="path12277" stroke-linejoin="round" d="m206,39.8c0,0.42777-1.75,1-4.5095,1.025-2.76,0.025-4.49-0.598-4.49-1.025" stroke="url(#radialGradient4480)" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.50549001" fill="none"/> - <path id="path12279" stroke-linejoin="round" d="m205.21,35.412c-0.25,0.25-1.7308,0.52495-3.8717,0.52495-2.1408,0-3.3783-0.27495-3.6283-0.52495" stroke="#FFF" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.75" fill="none"/> - <path id="path12281" opacity="0.35" stroke-linejoin="round" d="m200.5,46.52s0.25,0.5,1,0.47942,1-0.47942,1-0.47942" stroke="#000" stroke-linecap="round" stroke-width="0.49999997px" fill="none"/> - <path id="path12283" stroke-linejoin="miter" d="m205.5,34.531c-0.35937-1.3412-7.6317-1.3746-8,0,0,1.147-1,3.4598-1,6.5185s3.8365,5.2147,5,5.2147,5-2.156,5-5.2147-1-5.3715-1-6.5185z" stroke="#919191" stroke-linecap="round" stroke-width="1" fill="none"/> - </g> - <rect id="icon:32-32" height="32" width="32" y="24" x="176" fill="none"/> - <g id="g5148"> - <path id="path4112-4" d="m45.053,38.909a20.203,7.4751,0,1,1,-40.406,0,20.203,7.4751,0,1,1,40.406,0z" transform="matrix(1,0,0,1.243244,8,-1.767333)" fill="url(#radialGradient4120)"/> - <path id="path3214-0" d="m51.96,31.991c0,10.71-8.6821,19.392-19.39,19.392-10.709,0-19.391-8.6821-19.391-19.392,0-10.709,8.6816-19.39,19.391-19.39,10.708,0,19.39,8.6811,19.39,19.39z" fill-rule="nonzero" stroke="#39396c" stroke-miterlimit="4" fill="url(#radialGradient5143)"/> - <path id="path4348-39" opacity="0.42159382" d="m30.709,15.271a12.93,9.2934,0,1,1,-25.86,0,12.93,9.2934,0,1,1,25.86,0z" transform="matrix(0.835938,0,0,1,17.886868,8.505077)" fill="url(#radialGradient11220)"/> - <path id="path4144-1" d="m51.415,29.087l-0.53529,0.60632c-0.328-0.386-0.696-0.711-1.07-1.051l-0.82116,0.12083-0.75024-0.84808v1.0496l0.64276,0.48637,0.42782,0.4845,0.57174-0.6466c0.14392,0.26956,0.28587,0.53913,0.4288,0.80869v0.8078l-0.64375,0.72715-1.1781,0.80869-0.89219,0.89032-0.57174-0.64856,0.28587-0.72715-0.57086-0.6466-0.9641-2.0607-0.82116-0.92864-0.21494,0.24176,0.32232,1.1724,0.60632,0.68687c0.34629,0.99966,0.68884,1.9551,1.1436,2.9107,0.70515,0,1.3699-0.07486,2.0702-0.16307v0.56604l-0.85673,2.1015-0.7857,0.88836-0.64277,1.3757v2.2621l0.21494,0.89032-0.3569,0.40297-0.78668,0.48539-0.82116,0.68687,0.67921,0.76753-0.92864,0.80967,0.1784,0.5238-1.393,1.5772h-0.92765l-0.7857,0.48539h-0.50081v-0.6466l-0.21298-1.2952c-0.27634-0.81164-0.56408-1.6175-0.85672-2.4233,0-0.59483,0.03546-1.1839,0.07102-1.7786l0.35788-0.8078-0.50081-0.97088,0.03645-1.3335-0.67921-0.76753,0.3396-1.111-0.55258-0.62695h-0.96508l-0.32133-0.36358-0.9641,0.60681-0.39236-0.4456-0.89317,0.76792c-0.60632-0.68736-1.2136-1.3742-1.8208-2.0611l-0.712-1.696,0.642-0.969-0.356-0.403,0.784-1.861c0.64473-0.80201,1.3181-1.5714,1.9993-2.3436l1.2145-0.3233,1.3566-0.16121,0.92864,0.24274,1.321,1.3325,0.46437-0.52478,0.64178-0.08055,1.2145,0.40385h0.92864l0.64276-0.56604,0.28587-0.40385-0.64375-0.40385-1.0716-0.08055c-0.29736-0.41251-0.5737-0.84612-0.92677-1.2126l-0.35788,0.16121-0.14294,1.0514-0.64276-0.72715-0.14195-0.80967-0.71379-0.56408h-0.28685l0.71468,0.8078-0.28587,0.72715-0.57086,0.16121,0.3569-0.72715-0.64375-0.32232-0.56987-0.6466-1.0726,0.24176-0.14195,0.32232-0.64276,0.40484-0.3569,0.88934-0.89219,0.44413-0.39334-0.44413h-0.42782v-1.4553l0.92864-0.48539h0.71379l-0.14392-0.56506-0.56987-0.56604,0.96322-0.20247,0.53529-0.60534,0.42782-0.72813h0.78668l-0.21494-0.56506,0.50081-0.3233v0.6466l1.0706,0.24176,1.0706-0.88836,0.07191-0.40484,0.92765-0.6461c-0.33577,0.04175-0.67155,0.0724-0.99966,0.1617v-0.72804l0.3569-0.8083h-0.3569l-0.78432,0.72715-0.21494,0.40434,0.21494,0.56653-0.35788,0.96891-0.57086-0.3233-0.49885-0.56506-0.78668,0.56506-0.28587-1.2927,1.3566-0.88885v-0.48539l0.85761-0.56555,1.3566-0.32379,0.92864,0.32379,1.7134,0.3233-0.42782,0.4845h-0.92864l0.92864,0.9699,0.71379-0.8078,0.21681-0.35542s2.738,2.454,4.3027,5.1383c1.5647,2.6852,2.2995,5.8501,2.2995,6.4929z" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4152-9" d="m33.732,17.811-0.07191,0.48451,0.50081,0.3233,0.85574-0.56555-0.42782-0.485-0.57174,0.32379-0.28489-0.08105" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4160-6" d="m34.517,14.498-1.8573-0.72764-2.1413,0.24225-2.643,0.72715-0.49983,0.48539,1.6424,1.1311,0,0.6466-0.64276,0.6466,0.85761,1.6985,0.56987-0.32428,0.71566-1.1311c1.1032-0.34108,2.0924-0.72764,3.1409-1.2126l0.85761-2.182" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4168-9" d="m36.446,21.288-0.28587-0.72813-0.50081,0.16209,0.14392,0.88836,0.64276-0.32232" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4176-3" d="m36.731,21.125-0.14294,0.97088,0.7857-0.16209,0.57086-0.56506-0.49983-0.48539c-0.16789-0.44708-0.36073-0.86439-0.57086-1.2932h-0.42782v0.4845l0.28489,0.3233v0.72715" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4184-3" d="m26.163,36.482-0.57174-1.132-1.0711-0.24225-0.57125-1.535-1.428,0.16121-1.2136-0.88836-1.286,1.1311,0,0.1784c-0.38902-0.11228-0.86724-0.12761-1.2136-0.34059l-0.28587-0.8078v-0.88934l-0.85673,0.08056c0.07152-0.56604,0.14244-1.1311,0.21445-1.697h-0.50032l-0.49934,0.6466-0.50032,0.24176-0.71428-0.40297-0.07152-0.88934,0.14294-0.9699,1.0716-0.8078h0.85673l0.14244-0.48539,1.0711,0.24176,0.7857,0.97088,0.14294-1.6175,1.3569-1.1311,0.49983-1.2126,0.99966-0.40385,0.57125-0.8078,1.285-0.24363,0.64326-0.96891h-1.9283l1.214-0.56604h0.85623l1.2145-0.40484,0.14294-0.48352-0.4288-0.40484-0.49983-0.16209,0.14294-0.48451-0.3569-0.72715-0.85722,0.32232,0.14294-0.6461-0.99966-0.56604-0.78521,1.3733,0.07102,0.48539-0.78521,0.32428-0.50032,1.0504-0.21396-0.96989-1.3569-0.56604-0.21445-0.72715,1.7854-1.0514,0.7857-0.72715,0.07152-0.88885-0.42831-0.24274-0.57125-0.08105-0.3569,0.88934s-0.59718,0.117-0.75073,0.15492c-1.9609,1.807-5.923,5.7077-6.8435,13.072,0.03645,0.17074,0.66723,1.1608,0.66723,1.1608l1.4995,0.88836,1.4995,0.40484,0.64326,0.80869,0.99917,0.72715,0.57125-0.08056,0.42831,0.19284v0.13046l-0.57086,1.5354-0.4288,0.6466,0.14294,0.32428-0.3569,1.2107,1.2855,2.3446,1.285,1.132,0.57174,0.8078-0.07191,1.698,0.4288,0.96891-0.4288,1.8592s-0.0336-0.01149,0.02112,0.17457c0.05521,0.18616,2.288,1.4256,2.43,1.3201,0.14146-0.10747,0.26239-0.20148,0.26239-0.20148l-0.14244-0.40297,0.57086-0.56604,0.21445-0.56604,0.92864-0.32428,0.71379-1.7786-0.21396-0.48352,0.49885-0.72715,1.0716-0.24363,0.57174-1.2932-0.14294-1.6155,0.85673-1.2126,0.14294-1.2126c-1.1724-0.58137-2.3351-1.18-3.4987-1.7786" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4192-8" d="m24.591,18.134,0.71379,0.485,0.57174,0,0-0.56555-0.71379-0.3233-0.57174,0.40385" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4200-0" d="m22.735,17.488-0.35739,0.88885,0.71428,0,0.35739-0.8083c0.30797-0.21779,0.61447-0.43696,0.92814-0.6466l0.71428,0.24274c0.47586,0.3233,0.95172,0.6466,1.428,0.9694l0.71467-0.64611-0.78619-0.3233-0.35739-0.72764-1.3566-0.1617-0.07152-0.40434-0.64277,0.16209-0.28528,0.56565-0.35739-0.72764-0.14244,0.3233,0.07152,0.8083-0.57135,0.48529" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4228-5" d="m25.305,15.467,0.35739-0.32281,0.71428-0.1617c0.48922-0.23793,0.98041-0.39816,1.4995-0.56604l-0.28489-0.485-0.92196,0.13242-0.43558,0.43411-0.71811,0.10413-0.63844,0.29982-0.31033,0.15011-0.1895,0.25375,0.92765,0.16121" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path4236-6" d="m26.519,23.146,0.4288-0.6466-0.64326-0.4845,0.21445,1.1311" fill-opacity="0.71345029" fill-rule="nonzero" fill="#000"/> - <path id="path3224-6" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m51.213,28.885l-0.53529,0.60632c-0.328-0.386-0.696-0.711-1.07-1.051l-0.82116,0.12083-0.75024-0.84808v1.0496l0.64276,0.48637,0.42782,0.4845,0.57174-0.6466c0.14392,0.26956,0.28587,0.53913,0.4288,0.80869v0.8078l-0.64375,0.72715-1.1781,0.80869-0.89219,0.89032-0.57174-0.64856,0.28587-0.72715-0.57086-0.6466-0.9641-2.0607-0.82116-0.92864-0.21494,0.24176,0.32232,1.1724,0.60632,0.68687c0.34629,0.99966,0.68884,1.9551,1.1436,2.9107,0.70515,0,1.3699-0.07486,2.0702-0.16307v0.56604l-0.85673,2.1015-0.7857,0.88836-0.64277,1.3757v2.2621l0.21494,0.89032-0.3569,0.40297-0.78668,0.48539-0.82116,0.68687,0.67921,0.76753-0.92864,0.80967,0.1784,0.5238-1.393,1.5772h-0.92765l-0.7857,0.48539h-0.50081v-0.6466l-0.21298-1.2952c-0.27634-0.81164-0.56408-1.6175-0.85673-2.4233,0-0.59483,0.03546-1.1839,0.07103-1.7786l0.35788-0.8078-0.50081-0.97088,0.03645-1.3335-0.67921-0.76753,0.33961-1.111-0.55258-0.62695h-0.96508l-0.32133-0.36358-0.9641,0.60681-0.39236-0.4456-0.89317,0.76792c-0.60632-0.68736-1.2136-1.3742-1.8208-2.0611l-0.71379-1.698,0.64276-0.96891-0.3569-0.40385,0.78472-1.8602c0.64473-0.80201,1.3181-1.5714,1.9993-2.3436l1.2145-0.3233,1.3566-0.16121,0.92864,0.24274,1.321,1.3325,0.46437-0.52478,0.64178-0.08055,1.2145,0.40385h0.92864l0.64276-0.56604,0.28587-0.40385-0.64375-0.40385-1.0716-0.08055c-0.297-0.409-0.573-0.843-0.926-1.209l-0.35788,0.16121-0.14294,1.0514-0.64277-0.72715-0.14195-0.80967-0.71379-0.56408h-0.28685l0.71467,0.8078-0.28587,0.72715-0.57086,0.16121,0.3569-0.72715-0.64375-0.32232-0.56987-0.6466-1.0726,0.24176-0.14195,0.32232-0.64277,0.40484-0.3569,0.88934-0.89219,0.44413-0.39334-0.44413h-0.42782v-1.4553l0.92864-0.48539h0.71379l-0.14392-0.56506-0.56987-0.56604,0.96322-0.20247,0.53529-0.60534,0.42782-0.72813h0.78668l-0.21494-0.56506,0.50081-0.3233v0.6466l1.0706,0.24176,1.0706-0.88836,0.07191-0.40484,0.92765-0.6461c-0.33577,0.04175-0.67155,0.0724-0.99966,0.1617v-0.72804l0.3569-0.8083h-0.3569l-0.78432,0.72715-0.21494,0.40434,0.21494,0.56653-0.35788,0.96891-0.57086-0.3233-0.49885-0.56506-0.78668,0.56506-0.28587-1.2927,1.3566-0.88885v-0.48539l0.85761-0.56555,1.3566-0.32379,0.92864,0.32379,1.7134,0.3233-0.42782,0.4845h-0.92864l0.92864,0.9699,0.71379-0.8078,0.21681-0.35542s2.738,2.454,4.3027,5.1383c1.5647,2.6852,2.2995,5.8501,2.2995,6.4929z"/> - <path id="path3232-4" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m33.53,17.609-0.07191,0.48451,0.50081,0.3233,0.85574-0.56555-0.42782-0.485-0.57174,0.32379-0.28489-0.08105"/> - <path id="path3240-0" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m34.315,14.296-1.8573-0.72764-2.1413,0.24225-2.643,0.72715-0.49983,0.48539,1.6424,1.1311,0,0.6466-0.64276,0.6466,0.85761,1.6985,0.56987-0.32428,0.71566-1.1311c1.1032-0.34108,2.0924-0.72764,3.1409-1.2126l0.85761-2.182"/> - <path id="path3248-04" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m36.244,21.086-0.28587-0.72813-0.50081,0.16209,0.14392,0.88836,0.64276-0.32232"/> - <path id="path3256-6" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m36.529,20.923-0.14294,0.97088,0.7857-0.16209,0.57086-0.56506-0.49983-0.48539c-0.16789-0.44708-0.36073-0.86439-0.57086-1.2932h-0.42782v0.4845l0.28489,0.3233v0.72715"/> - <path id="path3264-2" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m25.96,36.28-0.57174-1.132-1.0711-0.24225-0.57125-1.535-1.428,0.16121-1.2136-0.88836-1.286,1.1311,0,0.1784c-0.38902-0.11228-0.86724-0.12761-1.2136-0.34059l-0.28587-0.8078v-0.88934l-0.85673,0.08056c0.07152-0.56604,0.14244-1.1311,0.21445-1.697h-0.50032l-0.49934,0.6466-0.50032,0.24176-0.71428-0.40297-0.07152-0.88934,0.14294-0.9699,1.0716-0.8078h0.85672l0.14244-0.48539,1.0711,0.24176,0.7857,0.97088,0.14294-1.6175,1.3569-1.1311,0.49983-1.2126,0.99966-0.40385,0.57125-0.8078,1.285-0.24363,0.64326-0.96891h-1.9283l1.214-0.56604h0.85624l1.2145-0.40484,0.14294-0.48352-0.4288-0.40484-0.49983-0.16209,0.14294-0.48451-0.3569-0.72715-0.85722,0.32232,0.14294-0.6461-0.99966-0.56604-0.78521,1.3733,0.07103,0.48539-0.78521,0.32428-0.50032,1.0504-0.21396-0.96989-1.357-0.56604-0.21445-0.72715,1.7854-1.0514,0.7857-0.72715,0.07152-0.88885-0.42832-0.24275-0.57125-0.08104-0.3569,0.88934s-0.59718,0.117-0.75073,0.15492c-1.9609,1.807-5.923,5.7077-6.8435,13.072,0.03645,0.17074,0.66723,1.1608,0.66723,1.1608l1.4995,0.88836,1.4995,0.40484,0.64326,0.80869,0.99917,0.72715,0.57125-0.08056,0.42831,0.19284v0.13046l-0.57086,1.5354-0.4288,0.6466,0.14294,0.32428-0.3569,1.2107,1.2855,2.3446,1.285,1.132,0.57174,0.8078-0.07191,1.698,0.4288,0.96891-0.4288,1.8592s-0.0336-0.01149,0.02112,0.17457c0.05521,0.18616,2.288,1.4256,2.43,1.3201,0.14146-0.10747,0.26239-0.20148,0.26239-0.20148l-0.14244-0.40297,0.57086-0.56604,0.21445-0.56604,0.92864-0.32428,0.71379-1.7786-0.21396-0.48352,0.49885-0.72715,1.0716-0.24363,0.57174-1.2932-0.14294-1.6155,0.85673-1.2126,0.14294-1.2126c-1.171-0.579-2.334-1.177-3.498-1.776"/> - <path id="path3272-6" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m24.389,17.932,0.71379,0.485,0.57174,0,0-0.56555-0.71379-0.3233-0.57174,0.40385"/> - <path id="path3280-7" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m22.533,17.286-0.35739,0.88885,0.71428,0,0.35739-0.8083c0.30797-0.21779,0.61447-0.43696,0.92814-0.6466l0.71428,0.24274c0.47586,0.3233,0.95172,0.6466,1.428,0.9694l0.71468-0.6461-0.78619-0.3233-0.35739-0.72764-1.3566-0.1617-0.07152-0.40434-0.64277,0.16209-0.28528,0.56565-0.35739-0.72764-0.14244,0.3233,0.07152,0.8083-0.57135,0.48529"/> - <path id="path3308-5" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m25.103,15.265,0.35739-0.32281,0.71428-0.1617c0.48922-0.23793,0.98041-0.39816,1.4995-0.56604l-0.28489-0.485-0.92196,0.13242-0.43558,0.43411-0.71811,0.10413-0.63844,0.29982-0.31033,0.15011-0.1895,0.25375,0.92765,0.16121"/> - <path id="path3316-6" fill-rule="nonzero" fill="url(#radialGradient5102)" d="m26.317,22.944,0.4288-0.6466-0.64326-0.4845,0.21445,1.1311"/> - <path id="path4122" d="m50.975,31.991c0,10.166-8.2412,18.407-18.406,18.407s-18.406-8.2412-18.406-18.407c0-10.165,8.2407-18.406,18.406-18.406,10.164,0,18.406,8.2402,18.406,18.406z" stroke="url(#radialGradient5099)" stroke-miterlimit="4" fill="none"/> - <path id="path10782-9" stroke-linejoin="miter" d="m51.512,19.054s1.0607-2.1971,0.95964-4.5709c-0.10102-2.3739-1.5152-3.3082-4.7982-3.1315-3.283,0.17678-11.574,4.8949-20.178,14.294-5.5383,6.0499-12.57,12.929-13.459,21.262-0.85716,8.035,7.2128,5.5665,12.216,3.4758l1.4304,0.31177c-1.7784,1.3835-7.0576,5.0942-11.602,4.2957-6.4246-1.2325-6.7098-7.9688-5.3746-13.271,2.3752-7.6514,7.0105-14.201,12.44-19.972,4.6608-4.9542,8.2576-7.2457,13.382-9.9816,5.1891-2.7703,15.371-5.1531,16.675,1.8084-0.05051,2.8789-1.3132,5.8084-1.3132,5.8084l-0.37881-0.3283z" fill-rule="evenodd" stroke="#9e5c00" stroke-linecap="butt" stroke-width="1px" fill="url(#radialGradient5096)"/> - <path id="path11071-8" stroke-linejoin="miter" style="stroke-dasharray:none;" d="M38.344,1.5c-3.119,0.0667-6.881,1.31-9.344,2.625-5.09,2.7173-8.533,4.9313-13.125,9.813-5.357,5.693-9.8693,12.092-12.188,19.531-0.63918,2.5381-0.88352,5.4147-0.25,7.6562,0.63114,2.2331,1.9488,3.8467,4.8125,4.4062,0.010779,0.0021,0.020427-0.0021,0.03125,0,1.836,0.31222,3.9657-0.32319,5.875-1.1875-1.4363,0.38406-2.8832,0.66065-4.25,0.59375-1.4369-0.071-2.8431-0.552-3.781-1.688s-1.3249-2.771-1.0938-4.938c0.94141-8.8248,8.2408-15.826,13.75-21.844,4.3535-4.7557,8.6131-8.3573,12.25-10.781,3.6369-2.4239,6.5254-3.7324,8.5938-3.8438,0.58068-0.031267,1.0611,0.026299,1.5625,0.0625-0.84-0.2652-1.772-0.4286-2.844-0.4057z" stroke-opacity="0.41975307" transform="translate(7.9668418,8.459395)" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/> - <path id="path4331" opacity="0.07000002" d="m52,33.188a14.625,3.3125,0,1,1,-29.25,0,14.625,3.3125,0,1,1,29.25,0z" transform="matrix(0.4206982,0,0,0.459933,31.123694,21.811736)" fill="url(#radialGradient4426)"/> - <path id="path3420-7" opacity="0.2" stroke-linejoin="round" style="stroke-dasharray:none;" d="m27.438,11a4.4375,2.1843,0,1,1,-8.875,0,4.4375,2.1843,0,1,1,8.875,0z" transform="matrix(1.2818465,0,0,0.9398128,18.041639,41.986501)" filter="url(#filter3436-1)" stroke="#000" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.61406273" fill="#000"/> - <path id="path3159" d="m52.695,25.802c-0.51711-1.0196-9.8251-1.0196-10.342,0,0,1.5293-1.5513,6.1174-1.5513,10.196,0,4.0783,5.1711,6.6272,6.7224,6.6272s6.7224-2.5489,6.7224-6.6272-1.5513-8.6663-1.5513-10.196z" fill-rule="evenodd" fill="url(#radialGradient5090)"/> - <path id="path3157" stroke-linejoin="round" style="stroke-dasharray:none;" d="m27.299,11a4.2985,1.9228,0,1,1,-8.597,0,4.2985,1.9228,0,1,1,8.597,0z" transform="matrix(1.2744752,0,0,1.0288787,18.211179,40.187537)" stroke="#888a85" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.91109008" fill="url(#linearGradient5044)"/> - <path id="path3236" stroke-linejoin="round" style="stroke-dasharray:none;" d="m26.511,11a3.5106,1.3537,0,1,1,-7.0211,0,3.5106,1.3537,0,1,1,7.0211,0z" transform="matrix(1.2818465,0,0,0.9398128,18.04164,41.167262)" stroke="url(#linearGradient4729)" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.91109008" fill="none"/> - <path id="path3163" stroke-linejoin="miter" d="m44.939,41.605c1.0342,1.0196,2.0684,2.5489,2.0684,8.1565,0,1.0196,0.13988,1.5293,0.51711,1.5293s0.51711-0.50978,0.51711-1.5293c0-5.6076,1.0342-7.137,2.0684-8.1565" fill-rule="evenodd" stroke="#888a85" stroke-linecap="round" stroke-width="1" fill="url(#linearGradient5085)"/> - <path id="path3179" d="m40.524,34.505c0,6,5.4487,8.1197,7,8.1197s7-2.1197,7-8.1197" fill-rule="evenodd" fill="url(#radialGradient5082)"/> - <path id="path5788" stroke-linejoin="round" style="stroke-dasharray:none;" d="m27.941,11a4.9408,1.6273,0,1,1,-9.8816,0,4.9408,1.6273,0,1,1,9.8816,0z" transform="matrix(1.2818465,0,0,0.9398128,18.041639,24.130395)" stroke="url(#linearGradient4444)" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.61406273" fill="url(#radialGradient4442)"/> - <path id="path10032" stroke-linejoin="miter" d="m20.594,4.8125-10.5,6.9062c-0.47185,2.1071,0.57612,3.8839,1.9688,5.1562,0.69977,0.63931,1.4779,1.1545,2.1875,1.5,0.70965,0.3455,1.3655,0.53125,1.75,0.53125,0.38459,0,1.0458-0.20765,1.7812-0.5625,0.73541-0.35485,1.5613-0.85244,2.2812-1.5312,1.4399-1.3576,2.4993-3.3228,1.8438-5.7812a0.10694,0.10694,0,0,1,0,-0.03125c-0.326-2.6112-0.671-3.939-1.312-6.1885z" transform="translate(31.454997,22.997187)" stroke="url(#linearGradient5146)" stroke-linecap="round" stroke-width="1" fill="none"/> - <path id="path3266" d="m43.755,27.672,3.1027,0s-1.5513,6.1174-1.5513,8.6663c0,1.5293,1.0342,2.5489,0.51711,3.0587-0.51711,0.50978-3.1027-1.4789-3.1027-4.0783,0-1.0196,0.51711-4.0783,1.0342-7.6467z" fill-rule="evenodd" fill="url(#linearGradient5077)"/> - <path id="path2385" stroke-linejoin="round" style="stroke-dasharray:none;" d="m27.034,11a4.0341,1.3945,0,1,1,-0.00061,-0.02423" transform="matrix(1.2850783,0,0,0.8891994,17.967308,15.950918)" stroke="#919191" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.91109008" fill="none"/> - <path id="path3358" stroke-linejoin="round" d="m52.524,26.97c-0.33333,0.33333-2.3078,0.69993-5.1622,0.69993s-4.5044-0.3666-4.8378-0.69993" stroke="#FFF" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.67398679" fill="none"/> - <path id="path3450" stroke-linejoin="round" d="m53.524,34.005c0,0.57036-2.3333,1.3333-6.0127,1.3666-3.6793,0.03327-5.9873-0.79624-5.9873-1.3666" stroke="url(#radialGradient5072)" stroke-linecap="round" stroke-miterlimit="0" stroke-width="0.67398679" fill="none"/> - <path id="path3395" opacity="0.35" stroke-linejoin="round" d="m46.191,43.005s0.33333,0.66667,1.3333,0.63923c1-0.02744,1.3333-0.63923,1.3333-0.63923" stroke="#000" stroke-linecap="round" stroke-width="0.66666669px" fill="none"/> - <path id="path3363" stroke-linejoin="round" d="m8,43.468,2.5-1,2.4688,0.125-4.9687,0.875z" fill-rule="evenodd" transform="matrix(1.0342194,0,0,1.019566,39.250355,6.687084)" filter="url(#filter3391-0)" stroke="url(#linearGradient4733)" stroke-linecap="round" stroke-width="0.64922434px" fill="url(#linearGradient4731)"/> - <path id="path3354" stroke-linejoin="miter" d="m52.695,25.802c-0.6711-1.7968-9.6711-1.7968-10.342,0,0,1.5293-1.8289,6.1249-1.8289,10.203,0,4.0783,5.4487,6.6197,7,6.6197s7-2.5414,7-6.6197-1.8289-8.6738-1.8289-10.203z" stroke="#919191" stroke-linecap="round" stroke-width="1" fill="none"/> - </g> - <rect id="icon:48-32" height="48" width="48" y="8" x="8" fill="none"/> -</svg> Modified: trunk/reactos/dll/cpl/inetcpl/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/security.c… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/security.c [iso-8859-1] Tue Dec 3 10:33:02 2013 @@ -63,7 +63,6 @@ #define NUM_TRACKBAR_POS 5 -static WCHAR spaceW[] = {' ',0}; static DWORD url_templates[] = {URLTEMPLATE_CUSTOM, URLTEMPLATE_LOW, URLTEMPLATE_MEDLOW, @@ -139,13 +138,8 @@ SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription); - name[0] = ' '; - name[1] = 0; - - LoadStringW(hcpl, IDS_SEC_SETTINGS, &name[1], sizeof(name)/sizeof(name[0]) - 3); - len = lstrlenW(name); - lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(name[0]) - len - 3); - lstrcatW(name, spaceW); + len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); + lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1); TRACE("new title: %s\n", debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_GROUP), name); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Dec 3 10:33:02 2013 @@ -221,7 +221,7 @@ reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.1 reactos/dll/win32/xmllite # Synced to Wine-1.7.1 -reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21 +reactos/dll/cpl/inetcpl # Synced to Wine-1.7.1 ReactOS shares the following programs with Winehq.

1 0

[aandrejevic] 61205: [FAST486] Implement the BOUND instruction.
by aandrejevic＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: aandrejevic Date: Tue Dec 3 01:30:15 2013 New Revision: 61205 URL: http://svn.reactos.org/svn/reactos?rev=61205&view=rev Log: [FAST486] Implement the BOUND instruction. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Tue Dec 3 01:30:15 2013 @@ -3524,10 +3524,102 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeBound) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + BOOLEAN OperandSize, AddressSize; + FAST486_MOD_REG_RM ModRegRm; + FAST486_SEG_REGS Segment = FAST486_REG_DS; + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + NO_LOCK_PREFIX(); + TOGGLE_OPSIZE(OperandSize); + TOGGLE_ADSIZE(AddressSize); + + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!ModRegRm.Memory) + { + /* Invalid */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + /* Check for the segment override */ + if (State->PrefixFlags & FAST486_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + if (OperandSize) + { + LONG Index, LowerBound, UpperBound; + + /* Read the operands */ + if (!Fast486ReadModrmDwordOperands(State, + &ModRegRm, + (PULONG)&Index, + (PULONG)&LowerBound)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Fast486ReadMemory(State, + Segment, + ModRegRm.MemoryAddress + sizeof(ULONG), + FALSE, + &UpperBound, + sizeof(ULONG))) + { + /* Exception occurred */ + return FALSE; + } + + if ((Index < LowerBound) || (Index > UpperBound)) + { + /* Out of bounds */ + Fast486Exception(State, FAST486_EXCEPTION_BR); + return FALSE; + } + } + else + { + SHORT Index, LowerBound, UpperBound; + + /* Read the operands */ + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + (PUSHORT)&Index, + (PUSHORT)&LowerBound)) + { + /* Exception occurred */ + return FALSE; + } + + if (!Fast486ReadMemory(State, + Segment, + ModRegRm.MemoryAddress + sizeof(USHORT), + FALSE, + &UpperBound, + sizeof(USHORT))) + { + /* Exception occurred */ + return FALSE; + } + + if ((Index < LowerBound) || (Index > UpperBound)) + { + /* Out of bounds */ + Fast486Exception(State, FAST486_EXCEPTION_BR); + return FALSE; + } + } + + return TRUE; } FAST486_OPCODE_HANDLER(Fast486OpcodeArpl)

1 0

[aandrejevic] 61204: [FAST486] Check for division by zero, and generate the appropriate exception.
by aandrejevic＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: aandrejevic Date: Tue Dec 3 00:56:47 2013 New Revision: 61204 URL: http://svn.reactos.org/svn/reactos?rev=61204&view=rev Log: [FAST486] Check for division by zero, and generate the appropriate exception. Modified: branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Tue Dec 3 00:56:47 2013 @@ -1012,8 +1012,17 @@ /* DIV */ case 6: { - UCHAR Quotient = State->GeneralRegs[FAST486_REG_EAX].LowWord / Value; - UCHAR Remainder = State->GeneralRegs[FAST486_REG_EAX].LowWord % Value; + UCHAR Quotient, Remainder; + + if (Value == 0) + { + /* Divide error */ + Fast486Exception(State, FAST486_EXCEPTION_DE); + return FALSE; + } + + Quotient = State->GeneralRegs[FAST486_REG_EAX].LowWord / Value; + Remainder = State->GeneralRegs[FAST486_REG_EAX].LowWord % Value; /* Write back the results */ State->GeneralRegs[FAST486_REG_EAX].LowByte = Quotient; @@ -1025,8 +1034,17 @@ /* IDIV */ case 7: { - CHAR Quotient = (SHORT)State->GeneralRegs[FAST486_REG_EAX].LowWord / (CHAR)Value; - CHAR Remainder = (SHORT)State->GeneralRegs[FAST486_REG_EAX].LowWord % (CHAR)Value; + CHAR Quotient, Remainder; + + if (Value == 0) + { + /* Divide error */ + Fast486Exception(State, FAST486_EXCEPTION_DE); + return FALSE; + } + + Quotient = (SHORT)State->GeneralRegs[FAST486_REG_EAX].LowWord / (CHAR)Value; + Remainder = (SHORT)State->GeneralRegs[FAST486_REG_EAX].LowWord % (CHAR)Value; /* Write back the results */ State->GeneralRegs[FAST486_REG_EAX].LowByte = (UCHAR)Quotient; @@ -1225,6 +1243,13 @@ /* DIV */ case 6: { + if (Value == 0) + { + /* Divide error */ + Fast486Exception(State, FAST486_EXCEPTION_DE); + return FALSE; + } + if (OperandSize) { ULONGLONG Dividend = (ULONGLONG)State->GeneralRegs[FAST486_REG_EAX].Long @@ -1254,6 +1279,13 @@ /* IDIV */ case 7: { + if (Value == 0) + { + /* Divide error */ + Fast486Exception(State, FAST486_EXCEPTION_DE); + return FALSE; + } + if (OperandSize) { LONGLONG Dividend = (LONGLONG)State->GeneralRegs[FAST486_REG_EAX].Long

1 0

[aandrejevic] 61203: [FAST486] The current "fast" method used in MOVS gives incorrect results. It has been temporarily replaced with a slow method that works correctly. The string functions do noth...
by aandrejevic＠svn.reactos.org 03 Dec '13

03 Dec '13

Author: aandrejevic Date: Tue Dec 3 00:12:55 2013 New Revision: 61203 URL: http://svn.reactos.org/svn/reactos?rev=61203&view=rev Log: [FAST486] The current "fast" method used in MOVS gives incorrect results. It has been temporarily replaced with a slow method that works correctly. The string functions do nothing when CX is 0 on entry, fix CMPS and SCAS. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Tue Dec 3 00:12:55 2013 @@ -5363,176 +5363,90 @@ Segment = State->SegmentOverride; } + if (State->PrefixFlags & FAST486_PREFIX_REP) + { + if ((AddressSize && (State->GeneralRegs[FAST486_REG_ECX].Long == 0)) + || (!AddressSize && (State->GeneralRegs[FAST486_REG_ECX].LowWord == 0))) + { + /* Do nothing */ + return TRUE; + } + } + /* Calculate the size */ if (Opcode == 0xA4) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + /* Read from the source operand */ + if (!Fast486ReadMemory(State, + Segment, + AddressSize ? State->GeneralRegs[FAST486_REG_ESI].Long + : State->GeneralRegs[FAST486_REG_ESI].LowWord, + FALSE, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write to the destination operand */ + if (!Fast486WriteMemory(State, + FAST486_REG_ES, + AddressSize ? State->GeneralRegs[FAST486_REG_EDI].Long + : State->GeneralRegs[FAST486_REG_EDI].LowWord, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement ESI and EDI */ + if (AddressSize) + { + if (!State->Flags.Df) + { + State->GeneralRegs[FAST486_REG_ESI].Long += DataSize; + State->GeneralRegs[FAST486_REG_EDI].Long += DataSize; + } + else + { + State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize; + State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; + } + } + else + { + if (!State->Flags.Df) + { + State->GeneralRegs[FAST486_REG_ESI].LowWord += DataSize; + State->GeneralRegs[FAST486_REG_EDI].LowWord += DataSize; + } + else + { + State->GeneralRegs[FAST486_REG_ESI].LowWord -= DataSize; + State->GeneralRegs[FAST486_REG_EDI].LowWord -= DataSize; + } + } + + // FIXME: This method is slow! if (State->PrefixFlags & FAST486_PREFIX_REP) { - UCHAR Block[STRING_BLOCK_SIZE]; - ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long - : State->GeneralRegs[FAST486_REG_ECX].LowWord; - - /* Clear the memory block */ - RtlZeroMemory(Block, sizeof(Block)); - - /* Transfer until finished */ - while (Count) - { - ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); - - /* Simulate the 16-bit wrap-around of SI and DI in 16-bit address mode */ - if (!AddressSize) + if (AddressSize) + { + if (--State->GeneralRegs[FAST486_REG_ECX].Long) { - ULONG MaxBytesSrc = State->Flags.Df - ? (ULONG)State->GeneralRegs[FAST486_REG_ESI].LowWord - : (0x10000 - (ULONG)State->GeneralRegs[FAST486_REG_ESI].LowWord); - ULONG MaxBytesDest = State->Flags.Df - ? (ULONG)State->GeneralRegs[FAST486_REG_EDI].LowWord - : (0x10000 - (ULONG)State->GeneralRegs[FAST486_REG_EDI].LowWord); - - - Processed = min(Processed, min(MaxBytesSrc, MaxBytesDest) / DataSize); - if (Processed == 0) Processed = 1; + /* Repeat the instruction */ + State->InstPtr = State->SavedInstPtr; } - - if (State->Flags.Df) + } + else + { + if (--State->GeneralRegs[FAST486_REG_ECX].LowWord) { - /* Move ESI and EDI to the start of the block */ - if (AddressSize) - { - State->GeneralRegs[FAST486_REG_ESI].Long -= (Processed - 1) * DataSize; - State->GeneralRegs[FAST486_REG_EDI].Long -= (Processed - 1) * DataSize; - } - else - { - State->GeneralRegs[FAST486_REG_ESI].LowWord -= (Processed - 1) * DataSize; - State->GeneralRegs[FAST486_REG_EDI].LowWord -= (Processed - 1) * DataSize; - } - } - - /* Read from memory */ - if (!Fast486ReadMemory(State, - Segment, - AddressSize ? State->GeneralRegs[FAST486_REG_ESI].Long - : State->GeneralRegs[FAST486_REG_ESI].LowWord, - FALSE, - Block, - Processed * DataSize)) - { - /* Set ECX */ - if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; - else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); - - /* Exception occurred */ - return FALSE; - } - - /* Write to memory */ - if (!Fast486WriteMemory(State, - FAST486_REG_ES, - AddressSize ? State->GeneralRegs[FAST486_REG_EDI].Long - : State->GeneralRegs[FAST486_REG_EDI].LowWord, - Block, - Processed * DataSize)) - { - /* Set ECX */ - if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; - else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); - - /* Exception occurred */ - return FALSE; - } - - if (!State->Flags.Df) - { - /* Increase ESI and EDI by the number of bytes transfered */ - if (AddressSize) - { - State->GeneralRegs[FAST486_REG_ESI].Long += Processed * DataSize; - State->GeneralRegs[FAST486_REG_EDI].Long += Processed * DataSize; - } - else - { - State->GeneralRegs[FAST486_REG_ESI].LowWord += Processed * DataSize; - State->GeneralRegs[FAST486_REG_EDI].LowWord += Processed * DataSize; - } - } - else - { - /* Reduce ESI and EDI */ - if (AddressSize) - { - State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize; - State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; - } - else - { - State->GeneralRegs[FAST486_REG_ESI].LowWord -= DataSize; - State->GeneralRegs[FAST486_REG_EDI].LowWord -= DataSize; - } - } - - /* Reduce the total count by the number processed in this run */ - Count -= Processed; - } - - /* Clear ECX */ - if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; - else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; - } - else - { - /* Read from the source operand */ - if (!Fast486ReadMemory(State, - FAST486_REG_DS, - AddressSize ? State->GeneralRegs[FAST486_REG_ESI].Long - : State->GeneralRegs[FAST486_REG_ESI].LowWord, - FALSE, - &Data, - DataSize)) - { - /* Exception occurred */ - return FALSE; - } - - /* Write to the destination operand */ - if (!Fast486WriteMemory(State, - FAST486_REG_ES, - AddressSize ? State->GeneralRegs[FAST486_REG_EDI].Long - : State->GeneralRegs[FAST486_REG_EDI].LowWord, - &Data, - DataSize)) - { - /* Exception occurred */ - return FALSE; - } - - /* Increment/decrement ESI and EDI */ - if (AddressSize) - { - if (!State->Flags.Df) - { - State->GeneralRegs[FAST486_REG_ESI].Long += DataSize; - State->GeneralRegs[FAST486_REG_EDI].Long += DataSize; - } - else - { - State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize; - State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; - } - } - else - { - if (!State->Flags.Df) - { - State->GeneralRegs[FAST486_REG_ESI].LowWord += DataSize; - State->GeneralRegs[FAST486_REG_EDI].LowWord += DataSize; - } - else - { - State->GeneralRegs[FAST486_REG_ESI].LowWord -= DataSize; - State->GeneralRegs[FAST486_REG_EDI].LowWord -= DataSize; + /* Repeat the instruction */ + State->InstPtr = State->SavedInstPtr; } } } @@ -5560,6 +5474,17 @@ { /* Use the override segment instead of DS */ Segment = State->SegmentOverride; + } + + if ((State->PrefixFlags & FAST486_PREFIX_REP) + || (State->PrefixFlags & FAST486_PREFIX_REPNZ)) + { + if ((AddressSize && (State->GeneralRegs[FAST486_REG_ECX].Long == 0)) + || (!AddressSize && (State->GeneralRegs[FAST486_REG_ECX].LowWord == 0))) + { + /* Do nothing */ + return TRUE; + } } /* Calculate the size */ @@ -5909,6 +5834,17 @@ TOGGLE_OPSIZE(OperandSize); TOGGLE_ADSIZE(AddressSize); + if ((State->PrefixFlags & FAST486_PREFIX_REP) + || (State->PrefixFlags & FAST486_PREFIX_REPNZ)) + { + if ((AddressSize && (State->GeneralRegs[FAST486_REG_ECX].Long == 0)) + || (!AddressSize && (State->GeneralRegs[FAST486_REG_ECX].LowWord == 0))) + { + /* Do nothing */ + return TRUE; + } + } + /* Calculate the size */ if (Opcode == 0xAE) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT);

1 0

[akhaldi] 61202: [VERSION_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: akhaldi Date: Mon Dec 2 22:45:51 2013 New Revision: 61202 URL: http://svn.reactos.org/svn/reactos?rev=61202&view=rev Log: [VERSION_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/version/CMakeLists.txt trunk/rostests/winetests/version/info.c trunk/rostests/winetests/version/install.c trunk/rostests/winetests/version/testlist.c trunk/rostests/winetests/version/version.rc Modified: trunk/rostests/winetests/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/CMakeLi… ============================================================================== --- trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -1,16 +1,10 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE info.c install.c - version.rc testlist.c) -add_executable(version_winetest ${SOURCE}) -target_link_libraries(version_winetest wine) +add_executable(version_winetest ${SOURCE} version.rc) set_module_type(version_winetest win32cui) add_importlibs(version_winetest version msvcrt kernel32 ntdll) add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/info.c?… ============================================================================== --- trunk/rostests/winetests/version/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/info.c [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -178,7 +178,6 @@ ok(retval == 0, "Expected 0, got %d\n", retval); ok(hdl == 0, "Expected 0, got %d\n", hdl); ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND || - GetLastError() == ERROR_BAD_FORMAT || /* win9x */ GetLastError() == ERROR_SUCCESS, /* win2k */ "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError()); @@ -195,8 +194,6 @@ d = (WORD)(Version & 0xffff); sprintf(lpszVerString, "%d.%d.%d.%d", a, b, c, d); - - return; } static void test_info(void) @@ -341,12 +338,14 @@ retvalW = GetFileVersionInfoSizeW( mypathW, &hdlW); pVersionInfoW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, retvalW ); retW = GetFileVersionInfoW( mypathW, 0, retvalW, pVersionInfoW ); + ok(retW, "GetFileVersionInfo failed: GetLastError = %u\n", GetLastError()); } GetModuleFileNameA(NULL, mypathA, MAX_PATH); retvalA = GetFileVersionInfoSizeA( mypathA, &hdlA); pVersionInfoA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, retvalA ); retA = GetFileVersionInfoA( mypathA, 0, retvalA, pVersionInfoA ); + ok(retA, "GetFileVersionInfo failed: GetLastError = %u\n", GetLastError()); if (is_unicode_enabled) { @@ -411,7 +410,7 @@ retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); - ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); + ok ( uiLengthW == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthW ); ok( uiLengthA == uiLengthW, "The size of VS_FIXEDFILEINFO should be the same for both A/W calls, it is (%d) vs. (%d)\n", uiLengthA, uiLengthW); @@ -499,12 +498,10 @@ ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 got %x\n", len); + ok(len == 0, "expected 0 got %x\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; @@ -568,12 +565,10 @@ ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ok(!ret, "VerQueryValue(%s) succeeded\n", buf); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 or 0xbeef, got %x\n", len); + ok(len == 0, "expected 0 or 0xbeef, got %x\n", len); } HeapFree(GetProcessHeap(), 0, ver); Modified: trunk/rostests/winetests/version/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/install… ============================================================================== --- trunk/rostests/winetests/version/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/install.c [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -89,7 +89,7 @@ "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); break; default: - todo_wine ok(0, "Got unexpected return value %x\n", ret); + ok(0, "Got unexpected return value %x\n", ret); } dwCur=MAX_PATH; @@ -111,7 +111,7 @@ "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); break; default: - todo_wine ok(0, "Got unexpected return value %x\n", ret); + ok(0, "Got unexpected return value %x\n", ret); } } } Modified: trunk/rostests/winetests/version/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/testlis… ============================================================================== --- trunk/rostests/winetests/version/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/testlist.c [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_info(void); extern void func_install(void); Modified: trunk/rostests/winetests/version/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/version… ============================================================================== --- trunk/rostests/winetests/version/version.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/version/version.rc [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" #include "winver.h" VS_VERSION_INFO VERSIONINFO

1 0

[akhaldi] 61201: [VERSION] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 02 Dec '13

02 Dec '13

Author: akhaldi Date: Mon Dec 2 22:45:16 2013 New Revision: 61201 URL: http://svn.reactos.org/svn/reactos?rev=61201&view=rev Log: [VERSION] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/reactos/dll/win32/version/version.c (with props) Removed: trunk/reactos/dll/win32/version/info.c trunk/reactos/dll/win32/version/install.c trunk/reactos/dll/win32/version/resource.c Modified: trunk/reactos/dll/win32/version/CMakeLists.txt trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/CMakeLis… Removed: trunk/reactos/dll/win32/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/info.c?r… Removed: trunk/reactos/dll/win32/version/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/install.… Removed: trunk/reactos/dll/win32/version/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/resource… Added: trunk/reactos/dll/win32/version/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

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