Commit dfc850c7 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit 12.5.1 upon wine-1.6

parent 556e2c89
......@@ -1306,10 +1306,12 @@ static inline WORD get_mac_code_page( const FT_SfntName *name )
static int match_name_table_language( const FT_SfntName *name, LANGID lang )
{
LANGID name_lang;
int res = 0;
switch (name->platform_id)
{
case TT_PLATFORM_MICROSOFT:
res += 5; /* prefer the Microsoft name */
switch (name->encoding_id)
{
case TT_MS_ID_UNICODE_CS:
......@@ -1326,6 +1328,7 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang )
name_lang = mac_langid_table[name->language_id];
break;
case TT_PLATFORM_APPLE_UNICODE:
res += 2; /* prefer Unicode encodings */
switch (name->encoding_id)
{
case TT_APPLE_ID_DEFAULT:
......@@ -1341,10 +1344,10 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang )
default:
return 0;
}
if (name_lang == lang) return 3;
if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) return 2;
if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) return 1;
return 0;
if (name_lang == lang) res += 30;
else if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) res += 20;
else if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) res += 10;
return res;
}
static WCHAR *copy_name_table_string( const FT_SfntName *name )
......
......@@ -116,6 +116,12 @@ typedef struct
LONG ref;
} cache_entry;
static const tid_t schema_cache_se_tids[] = {
IXMLDOMSchemaCollection_tid,
IXMLDOMSchemaCollection2_tid,
NULL_tid
};
/* datatypes lookup stuff
* generated with help from gperf */
#define DT_MIN_STR_LEN 2
......@@ -1105,6 +1111,10 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac
{
return *ppvObject ? S_OK : E_NOINTERFACE;
}
else if(IsEqualGUID( riid, &IID_ISupportErrorInfo ))
{
return node_create_supporterrorinfo(schema_cache_se_tids, ppvObject);
}
else
{
FIXME("interface %s not implemented\n", debugstr_guid(riid));
......
......@@ -10712,6 +10712,7 @@ static void test_supporterrorinfo(void)
&IID_IXMLDOMDocument2, &IID_IXMLDOMDocument3 };
const supporterror_t *ptr = supporterror_test;
ISupportErrorInfo *errorinfo, *info2;
IXMLDOMSchemaCollection *schemacache;
IXMLDOMNamedNodeMap *map, *map2;
IXMLDOMDocument *doc;
IXMLDOMElement *elem;
......@@ -10838,6 +10839,20 @@ static void test_supporterrorinfo(void)
IXMLDOMElement_Release(elem);
IXMLDOMDocument_Release(doc);
/* IXMLDOMSchemaCollection */
hr = CoCreateInstance(&CLSID_XMLSchemaCache, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMSchemaCollection, (void**)&schemacache);
ok(hr == S_OK, "failed to create schema collection, 0x%08x\n", hr);
hr = IXMLDOMSchemaCollection_QueryInterface(schemacache, &IID_ISupportErrorInfo, (void**)&errorinfo);
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, &IID_IXMLDOMSchemaCollection);
ok(hr == S_OK, "got 0x%08x\n", hr);
ISupportErrorInfo_Release(errorinfo);
IXMLDOMSchemaCollection_Release(schemacache);
free_bstrs();
}
......
......@@ -4922,7 +4922,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
caps->MaxUserClipPlanes = vertex_caps.max_user_clip_planes;
caps->MaxActiveLights = vertex_caps.max_active_lights;
if (cxgames_hacks.max_vertex_blend_matrices && vertex_caps.max_vertex_blend_matrices == 1)
if (cxgames_hacks.max_vertex_blend_matrices && vertex_caps.max_vertex_blend_matrices <= 1)
caps->MaxVertexBlendMatrices = cxgames_hacks.max_vertex_blend_matrices;
else
caps->MaxVertexBlendMatrices = vertex_caps.max_vertex_blend_matrices;
......
......@@ -1026,67 +1026,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
- (void) makeFocused:(BOOL)activate
{
WineApplicationController* controller = [WineApplicationController sharedController];
NSArray* screens;
WineWindow* front;
BOOL wasVisible = [self isVisible];
[controller transformProcessToForeground];
/* If a borderless window is offscreen, orderFront: won't move
it onscreen like it would for a titled window. Do that ourselves. */
screens = [NSScreen screens];
if (!([self styleMask] & NSTitledWindowMask) && ![self isOrderedIn] &&
!frame_intersects_screens([self frame], screens))
{
NSScreen* primaryScreen = [screens objectAtIndex:0];
NSRect frame = [primaryScreen frame];
[self setFrameTopLeftPoint:NSMakePoint(NSMinX(frame), NSMaxY(frame))];
frame = [self constrainFrameRect:[self frame] toScreen:primaryScreen];
[self setFrame:frame display:YES];
[self updateColorSpace];
}
if (activate)
[NSApp activateIgnoringOtherApps:YES];
NSDisableScreenUpdates();
if (latentParentWindow)
{
if ([latentParentWindow level] > [self level])
[self setLevel:[latentParentWindow level]];
[latentParentWindow addChildWindow:self ordered:NSWindowAbove];
self.latentParentWindow = nil;
}
front = [controller frontWineWindow];
if (front && [self level] < [front level])
[self setLevel:[front level]];
[self orderFront:nil];
if (!wasVisible && fullscreen && [self isOnActiveSpace])
[controller updateFullscreenWindows];
[controller adjustWindowLevels];
if (pendingMinimize)
{
ignore_windowMiniaturize = TRUE;
[self miniaturize:nil];
pendingMinimize = FALSE;
}
NSEnableScreenUpdates();
[self orderBelow:nil orAbove:nil activate:activate];
causing_becomeKeyWindow = TRUE;
[self makeKeyWindow];
causing_becomeKeyWindow = FALSE;
if (![self isExcludedFromWindowsMenu])
[NSApp addWindowsItem:self title:[self title] filename:NO];
/* Cocoa may adjust the frame when the window is ordered onto the screen.
Generate a frame-changed event just in case. The back end will ignore
it if nothing actually changed. */
[self windowDidResize:nil];
}
- (void) postKey:(uint16_t)keyCode
......
......@@ -911,9 +911,11 @@ void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event)
event->mouse_scroll.x, event->mouse_scroll.y,
event->mouse_scroll.time_ms, (GetTickCount() - event->mouse_scroll.time_ms));
if (event->mouse_scroll.y_scroll)
send_mouse_input(hwnd, event->window, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE,
event->mouse_scroll.x, event->mouse_scroll.y,
event->mouse_scroll.y_scroll, FALSE, event->mouse_scroll.time_ms);
if (event->mouse_scroll.x_scroll)
send_mouse_input(hwnd, event->window, MOUSEEVENTF_HWHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE,
event->mouse_scroll.x, event->mouse_scroll.y,
event->mouse_scroll.x_scroll, FALSE, event->mouse_scroll.time_ms);
......
......@@ -13,7 +13,6 @@ Descent: 410
LayerCount: 2
Layer: 0 1 "Back" 1
Layer: 1 1 "Fore" 0
NeedsXUIDChange: 1
FSType: 0
OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
......@@ -52,7 +51,7 @@ AntiAlias: 1
FitToEm: 1
WinInfo: 0 33 12
TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
BeginChars: 256 4
BeginChars: 256 30
StartChar: f020
Encoding: 0 61472 0
......@@ -75,9 +74,17 @@ SplineSet
EndSplineSet
EndChar
StartChar: ogonek
Encoding: 254 731 1
Width: 1896
StartChar: space
Encoding: 32 32 1
Width: 2048
VWidth: 0
Flags: W
LayerCount: 2
EndChar
StartChar: boxcheckbld
Encoding: 254 731 2
Width: 1826
Flags: W
LayerCount: 2
Fore
......@@ -104,9 +111,9 @@ SplineSet
EndSplineSet
EndChar
StartChar: registered
Encoding: 168 174 2
Width: 1884
StartChar: box2
Encoding: 168 174 3
Width: 1825
Flags: W
LayerCount: 2
Fore
......@@ -124,10 +131,10 @@ SplineSet
EndSplineSet
EndChar
StartChar: G
Encoding: 71 71 3
Width: 1581
Flags: HW
StartChar: handptup
Encoding: 71 71 4
Width: 1124
Flags: W
LayerCount: 2
Fore
SplineSet
......@@ -162,5 +169,522 @@ SplineSet
408 776 408 776 408 428 c 0,18,19
EndSplineSet
EndChar
StartChar: circle6
Encoding: 108 955 5
Width: 1529
Flags: W
LayerCount: 2
Fore
SplineSet
173 739 m 0,0,1
173 976 173 976 357.5 1155 c 128,-1,2
542 1334 542 1334 787 1334 c 0,3,4
1024 1334 1024 1334 1191 1167 c 128,-1,5
1358 1000 1358 1000 1358 743 c 0,6,7
1358 490 1358 490 1183 319.5 c 128,-1,8
1008 149 1008 149 763 149 c 0,9,10
526 149 526 149 349.5 323.5 c 128,-1,11
173 498 173 498 173 739 c 0,0,1
EndSplineSet
EndChar
StartChar: square6
Encoding: 110 957 6
Width: 1529
Flags: W
LayerCount: 2
Fore
SplineSet
1357 148 m 1,0,-1
1357 1332 l 1,1,-1
173 1332 l 1,2,-1
173 148 l 1,3,-1
1357 148 l 1,0,-1
EndSplineSet
EndChar
StartChar: lozenge4
Encoding: 115 963 7
Width: 937
Flags: W
LayerCount: 2
Fore
SplineSet
465 1155 m 1,0,-1
755 736 l 1,1,-1
465 318 l 1,2,-1
176 736 l 1,3,-1
465 1155 l 1,0,-1
EndSplineSet
EndChar
StartChar: lozenge6
Encoding: 116 964 8
Width: 1529
Flags: W
LayerCount: 2
Fore
SplineSet
765 1555 m 1,0,-1
1347 734 l 1,1,-1
765 -86 l 1,2,-1
184 734 l 1,3,-1
765 1555 l 1,0,-1
EndSplineSet
EndChar
StartChar: rhombus6
Encoding: 117 965 9
Width: 2020
Flags: W
LayerCount: 2
Fore
SplineSet
1008 1559 m 1,0,-1
1842 725 l 1,1,-1
1008 -110 l 1,2,-1
173 725 l 1,3,-1
1008 1559 l 1,0,-1
EndSplineSet
EndChar
StartChar: xrhombus
Encoding: 118 982 10
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
773 740 m 1,0,-1
473 1040 l 1,1,-1
173 740 l 1,2,-1
473 440 l 1,3,-1
773 740 l 1,0,-1
1212 300 m 1,4,-1
912 600 l 1,5,-1
612 300 l 1,6,-1
912 0 l 1,7,-1
1212 300 l 1,4,-1
1654 740 m 1,8,-1
1353 1041 l 1,9,-1
1052 740 l 1,10,-1
1353 439 l 1,11,-1
1654 740 l 1,8,-1
1212 1180 m 1,12,-1
912 1480 l 1,13,-1
612 1180 l 1,14,-1
912 880 l 1,15,-1
1212 1180 l 1,12,-1
EndSplineSet
EndChar
StartChar: rhombus4
Encoding: 119 969 11
Width: 1183
Flags: W
LayerCount: 2
Fore
SplineSet
605 1118 m 1,0,-1
1040 682 l 1,1,-1
605 246 l 1,2,-1
169 682 l 1,3,-1
605 1118 l 1,0,-1
EndSplineSet
EndChar
StartChar: circle2
Encoding: 158 158 12
Width: 641
Flags: W
LayerCount: 2
Fore
SplineSet
173 740 m 0,0,1
173 799 173 799 219.5 843.5 c 128,-1,2
266 888 266 888 327 888 c 0,3,4
387 888 387 888 428 846.5 c 128,-1,5
469 805 469 805 469 741 c 0,6,7
469 678 469 678 425.5 635 c 128,-1,8
382 592 382 592 321 592 c 0,9,10
261 592 261 592 217 636 c 128,-1,11
173 680 173 680 173 740 c 0,0,1
EndSplineSet
EndChar
StartChar: circle4
Encoding: 159 159 13
Width: 937
Flags: W
LayerCount: 2
Fore
SplineSet
173 739 m 0,0,1
173 857 173 857 265.5 946.5 c 128,-1,2
358 1036 358 1036 480 1036 c 0,3,4
598 1036 598 1036 681.5 952.5 c 128,-1,5
765 869 765 869 765 741 c 0,6,7
765 615 765 615 677.5 529.5 c 128,-1,8
590 444 590 444 468 444 c 0,9,10
350 444 350 444 261.5 531.5 c 128,-1,11
173 619 173 619 173 739 c 0,0,1
EndSplineSet
EndChar
StartChar: sqaure2
Encoding: 160 160 14
Width: 641
Flags: W
LayerCount: 2
Fore
SplineSet
469 592 m 1,0,-1
469 888 l 1,1,-1
173 888 l 1,2,-1
173 592 l 1,3,-1
469 592 l 1,0,-1
EndSplineSet
EndChar
StartChar: ring2
Encoding: 161 978 15
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
498.5 311.5 m 128,-1,1
675 137 675 137 912 137 c 0,2,3
1157 137 1157 137 1332 307.5 c 128,-1,4
1507 478 1507 478 1507 731 c 0,5,6
1507 988 1507 988 1340 1155 c 128,-1,7
1173 1322 1173 1322 936 1322 c 0,8,9
691 1322 691 1322 506.5 1143 c 128,-1,10
322 964 322 964 322 727 c 0,11,0
322 486 322 486 498.5 311.5 c 128,-1,1
1430.5 1245.5 m 128,-1,13
1644 1032 1644 1032 1644 730 c 256,14,15
1644 428 1644 428 1430.5 214 c 128,-1,16
1217 0 1217 0 914 0 c 0,17,18
612 0 612 0 398.5 214 c 128,-1,19
185 428 185 428 185 730 c 256,20,21
185 1032 185 1032 398.5 1245.5 c 128,-1,22
612 1459 612 1459 914 1459 c 0,23,12
1217 1459 1217 1459 1430.5 1245.5 c 128,-1,13
EndSplineSet
EndChar
StartChar: ring4
Encoding: 162 8242 16
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
573 387 m 128,-1,1
718 244 718 244 912 244 c 0,2,3
1113 244 1113 244 1256.5 384 c 128,-1,4
1400 524 1400 524 1400 731 c 0,5,6
1400 942 1400 942 1263 1079 c 128,-1,7
1126 1216 1126 1216 932 1216 c 0,8,9
731 1216 731 1216 579.5 1069 c 128,-1,10
428 922 428 922 428 728 c 0,11,0
428 530 428 530 573 387 c 128,-1,1
1430.5 1245.5 m 128,-1,13
1644 1032 1644 1032 1644 730 c 256,14,15
1644 428 1644 428 1430.5 214 c 128,-1,16
1217 0 1217 0 914 0 c 0,17,18
612 0 612 0 398.5 214 c 128,-1,19
185 428 185 428 185 730 c 256,20,21
185 1032 185 1032 398.5 1245.5 c 128,-1,22
612 1459 612 1459 914 1459 c 0,23,12
1217 1459 1217 1459 1430.5 1245.5 c 128,-1,13
EndSplineSet
EndChar
StartChar: ring6
Encoding: 163 8804 17
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
1430.5 1245.5 m 128,-1,1
1644 1032 1644 1032 1644 730 c 256,2,3
1644 428 1644 428 1430.5 214 c 128,-1,4
1217 0 1217 0 914 0 c 0,5,6
612 0 612 0 398.5 214 c 128,-1,7
185 428 185 428 185 730 c 256,8,9
185 1032 185 1032 398.5 1245.5 c 128,-1,10
612 1459 612 1459 914 1459 c 0,11,0
1217 1459 1217 1459 1430.5 1245.5 c 128,-1,1
706.5 521.5 m 128,-1,13
795 434 795 434 913 434 c 0,14,15
1035 434 1035 434 1122.5 519.5 c 128,-1,16
1210 605 1210 605 1210 731 c 0,17,18
1210 859 1210 859 1126.5 942.5 c 128,-1,19
1043 1026 1043 1026 925 1026 c 0,20,21
803 1026 803 1026 710.5 936.5 c 128,-1,22
618 847 618 847 618 729 c 0,23,12
618 609 618 609 706.5 521.5 c 128,-1,13
EndSplineSet
EndChar
StartChar: ringbutton2
Encoding: 164 8260 18
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
498.5 311.5 m 128,-1,1
675 137 675 137 912 137 c 0,2,3
1157 137 1157 137 1332 307.5 c 128,-1,4
1507 478 1507 478 1507 731 c 0,5,6
1507 988 1507 988 1340 1155 c 128,-1,7
1173 1322 1173 1322 936 1322 c 0,8,9
691 1322 691 1322 506.5 1143 c 128,-1,10
322 964 322 964 322 727 c 0,11,0
322 486 322 486 498.5 311.5 c 128,-1,1
1430.5 1245.5 m 128,-1,13
1644 1032 1644 1032 1644 730 c 256,14,15
1644 428 1644 428 1430.5 214 c 128,-1,16
1217 0 1217 0 914 0 c 0,17,18
612 0 612 0 398.5 214 c 128,-1,19
185 428 185 428 185 730 c 256,20,21
185 1032 185 1032 398.5 1245.5 c 128,-1,22
612 1459 612 1459 914 1459 c 0,23,12
1217 1459 1217 1459 1430.5 1245.5 c 128,-1,13
618 729 m 0,24,25
618 847 618 847 710.5 936.5 c 128,-1,26
803 1026 803 1026 925 1026 c 0,27,28
1043 1026 1043 1026 1126.5 942.5 c 128,-1,29
1210 859 1210 859 1210 731 c 0,30,31
1210 605 1210 605 1122.5 519.5 c 128,-1,32
1035 434 1035 434 913 434 c 0,33,34
795 434 795 434 706.5 521.5 c 128,-1,35
618 609 618 609 618 729 c 0,24,25
EndSplineSet
EndChar
StartChar: target
Encoding: 165 8734 19
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
498.5 311.5 m 128,-1,1
675 137 675 137 912 137 c 0,2,3
1157 137 1157 137 1332 307.5 c 128,-1,4
1507 478 1507 478 1507 731 c 0,5,6
1507 988 1507 988 1340 1155 c 128,-1,7
1173 1322 1173 1322 936 1322 c 0,8,9
691 1322 691 1322 506.5 1143 c 128,-1,10
322 964 322 964 322 727 c 0,11,0
322 486 322 486 498.5 311.5 c 128,-1,1
1430.5 1245.5 m 128,-1,13
1644 1032 1644 1032 1644 730 c 256,14,15
1644 428 1644 428 1430.5 214 c 128,-1,16
1217 0 1217 0 914 0 c 0,17,18
612 0 612 0 398.5 214 c 128,-1,19
185 428 185 428 185 730 c 256,20,21
185 1032 185 1032 398.5 1245.5 c 128,-1,22
612 1459 612 1459 914 1459 c 0,23,12
1217 1459 1217 1459 1430.5 1245.5 c 128,-1,13
706.5 521.5 m 128,-1,25
795 434 795 434 913 434 c 0,26,27
1035 434 1035 434 1122.5 519.5 c 128,-1,28
1210 605 1210 605 1210 731 c 0,29,30
1210 859 1210 859 1126.5 942.5 c 128,-1,31
1043 1026 1043 1026 925 1026 c 0,32,33
803 1026 803 1026 710.5 936.5 c 128,-1,34
618 847 618 847 618 729 c 0,35,24
618 609 618 609 706.5 521.5 c 128,-1,25
766 730 m 0,36,37
766 789 766 789 812.5 833.5 c 128,-1,38
859 878 859 878 920 878 c 0,39,40
980 878 980 878 1021 836.5 c 128,-1,41
1062 795 1062 795 1062 731 c 0,42,43
1062 668 1062 668 1018.5 625 c 128,-1,44
975 582 975 582 914 582 c 0,45,46
854 582 854 582 810 626 c 128,-1,47
766 670 766 670 766 730 c 0,36,37
448 728 m 0,48,49
448 914 448 914 593 1055 c 128,-1,50
738 1196 738 1196 931 1196 c 0,51,52
1118 1196 1118 1196 1249.5 1064.5 c 128,-1,53
1381 933 1381 933 1381 731 c 0,54,55
1381 532 1381 532 1243 397.5 c 128,-1,56
1105 263 1105 263 912 263 c 0,57,58
726 263 726 263 587 400.5 c 128,-1,59
448 538 448 538 448 728 c 0,48,49
EndSplineSet
EndChar
StartChar: square4
Encoding: 167 9827 20
Width: 937
Flags: W
LayerCount: 2
Fore
SplineSet
765 444 m 1,0,-1
765 1036 l 1,1,-1
173 1036 l 1,2,-1
173 444 l 1,3,-1
765 444 l 1,0,-1
EndSplineSet
EndChar
StartChar: head2left
Encoding: 215 8901 21
Width: 1627
Flags: W
LayerCount: 2
Fore
SplineSet
1455 0 m 1,0,-1
173 740 l 1,1,-1
1455 1480 l 1,2,-1
1028 740 l 1,3,-1
1455 0 l 1,0,-1
272 741 m 1,4,-1
971 741 l 1,5,-1
1321 1346 l 1,6,-1
272 741 l 1,4,-1
EndSplineSet
EndChar
StartChar: head2right
Encoding: 216 255 22
Width: 1627
Flags: W
LayerCount: 2
Fore
Refer: 21 8901 N -1 0 0 1 1628 0 2
EndChar
StartChar: head2up
Encoding: 217 376 23
Width: 1825
Flags: W
LayerCount: 2
Fore
Refer: 21 8901 N 0 -1 1 0 173 1653 2
EndChar
StartChar: head2down
Encoding: 218 8260 24
Width: 1825
Flags: W
LayerCount: 2
Fore
Refer: 21 8901 N 0 1 -1 0 1653 -173 2
EndChar
StartChar: checkbld
Encoding: 252 63740 25
Width: 1609
Flags: W
LayerCount: 2
Fore
SplineSet
1497 1560 m 1,0,1
1522 1510 l 1,2,-1
1533 1510 l 1,3,4
862.197 987 862.197 987 667 398 c 1,5,-1
465 252 l 1,6,7
330 696 330 696 155 768 c 1,8,9
254 882 254 882 353 882 c 0,10,11
439 882 439 882 555 602 c 1,12,13
735.665 1141 735.665 1141 1497 1560 c 1,0,1
EndSplineSet
EndChar
StartChar: boxshadowdwn
Encoding: 113 952 26
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
300 300 m 1,0,-1
1300 300 l 1,1,-1
1300 1300 l 1,2,-1
300 1300 l 1,3,-1
300 300 l 1,0,-1
400 0 m 1,4,-1
200 200 l 1,5,-1
200 1400 l 1,6,-1
1400 1400 l 1,7,-1
1600 1200 l 1,8,-1
1600 0 l 1,9,-1
400 0 l 1,4,-1
EndSplineSet
EndChar
StartChar: boxshadowup
Encoding: 114 961 27
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
1300 100 m 1,0,-1
1300 1100 l 1,1,-1
300 1100 l 1,2,-1
300 100 l 1,3,-1
1300 100 l 1,0,-1
1600 200 m 1,4,-1
1400 0 l 1,5,-1
200 0 l 1,6,-1
200 1200 l 1,7,-1
400 1400 l 1,8,-1
1600 1400 l 1,9,-1
1600 200 l 1,4,-1
EndSplineSet
EndChar
StartChar: box3
Encoding: 111 959 28
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
372 200 m 1,0,-1
1452 200 l 1,1,-1
1452 1280 l 1,2,-1
372 1280 l 1,3,-1
372 200 l 1,0,-1
172 0 m 1,4,-1
172 1480 l 1,5,-1
1652 1480 l 1,6,-1
1652 0 l 1,7,-1
172 0 l 1,4,-1
EndSplineSet
EndChar
StartChar: box4
Encoding: 112 960 29
Width: 1825
Flags: W
LayerCount: 2
Fore
SplineSet
472 300 m 1,0,-1
1352 300 l 1,1,-1
1352 1180 l 1,2,-1
472 1180 l 1,3,-1
472 300 l 1,0,-1
172 0 m 1,4,-1
172 1480 l 1,5,-1
1652 1480 l 1,6,-1
1652 0 l 1,7,-1
172 0 l 1,4,-1
EndSplineSet
EndChar
EndChars
EndSplineFont
No preview for this file type
......@@ -758,6 +758,9 @@ static void apple_override_bundle_name( int argc, char *argv[] )
new_bundle_name = argv[1];
if ((p = strrchr(new_bundle_name, '\\'))) new_bundle_name = p + 1;
if ((p = strrchr(new_bundle_name, '/'))) new_bundle_name = p + 1;
if (strspn(new_bundle_name, "0123456789abcdefABCDEF") == 32 &&
new_bundle_name[32] == '.')
new_bundle_name += 33;
if ((p = strrchr(new_bundle_name, '.')) && p != new_bundle_name)
new_bundle_name_len = p - new_bundle_name;
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment