March 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Set application Dock icon from first icon resource in process's .exe file.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: b1de532393bf2b1f3b78cfb2d6f2b7b420341755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1de532393bf2b1f3b78cfb2d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:49 2013 -0500 winemac: Set application Dock icon from first icon resource in process's .exe file. --- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 60 +++++++++- dlls/winemac.drv/image.c | 274 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 15 ++ 6 files changed, 352 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1de532393bf2b1f3b78c…

1 0

Ken Thomases : winemac: Implement rudimentary support for system tray icons as Mac status items.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 9714e6ee6388f5715301f44495aca4ca84e87873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9714e6ee6388f5715301f4449… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:54 2013 -0500 winemac: Implement rudimentary support for system tray icons as Mac status items. --- dlls/winemac.drv/Makefile.in | 2 + dlls/winemac.drv/cocoa_status_item.m | 175 +++++++++++++++++ dlls/winemac.drv/event.c | 5 + dlls/winemac.drv/image.c | 2 +- dlls/winemac.drv/macdrv.h | 3 + dlls/winemac.drv/macdrv_cocoa.h | 13 ++ dlls/winemac.drv/systray.c | 358 ++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 3 + 8 files changed, 560 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9714e6ee6388f5715301f…

1 0

Ken Thomases : winemac: Allow Command-[Shift-] Tab to switch apps even when the displays are captured.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 6ee486644a4313366fa7c95b93d371ef3e04255a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee486644a4313366fa7c95b9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:59 2013 -0500 winemac: Allow Command-[Shift-]Tab to switch apps even when the displays are captured. --- dlls/winemac.drv/cocoa_app.m | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index a417674..b14c550 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -672,6 +672,49 @@ int macdrv_err_on; [self setApplicationIconImage:nsimage]; } + - (void) handleCommandTab + { + if ([self isActive]) + { + NSRunningApplication* thisApp = [NSRunningApplication currentApplication]; + NSRunningApplication* app; + NSRunningApplication* otherValidApp = nil; + + if ([originalDisplayModes count]) + { + CGRestorePermanentDisplayConfiguration(); + CGReleaseAllDisplays(); + [originalDisplayModes removeAllObjects]; + } + + for (app in [[NSWorkspace sharedWorkspace] runningApplications]) + { + if (![app isEqual:thisApp] && !app.terminated && + app.activationPolicy == NSApplicationActivationPolicyRegular) + { + if (!app.hidden) + { + // There's another visible app. Just hide ourselves and let + // the system activate the other app. + [self hide:self]; + return; + } + + if (!otherValidApp) + otherValidApp = app; + } + } + + // Didn't find a visible GUI app. Try the Finder or, if that's not + // running, the first hidden GUI app. If even that doesn't work, we + // just fail to switch and remain the active app. + app = [[NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.finder"] lastObject]; + if (!app) app = otherValidApp; + [app unhide]; + [app activateWithOptions:0]; + } + } + /* * ---------- Cursor clipping methods ---------- * @@ -1084,6 +1127,19 @@ int macdrv_err_on; // Make sure next mouse move event starts over from an absolute baseline. forceNextMouseMoveAbsolute = TRUE; } + else if (type == NSKeyDown && ![anEvent isARepeat] && [anEvent keyCode] == kVK_Tab) + { + NSUInteger modifiers = [anEvent modifierFlags]; + if ((modifiers & NSCommandKeyMask) && + !(modifiers & (NSControlKeyMask | NSAlternateKeyMask))) + { + // Command-Tab and Command-Shift-Tab would normally be intercepted + // by the system to switch applications. If we're seeing it, it's + // presumably because we've captured the displays, preventing + // normal application switching. Do it manually. + [self handleCommandTab]; + } + } }

1 0

Dmitry Timoshkov : windowscodecs: Make JPEG decoder fallback to 96 dpi resolution for density_unit == 0 case .
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: fb87ee2464ea9904b8aa3f1bbdb52a94f610e492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb87ee2464ea9904b8aa3f1bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 18 14:22:13 2013 +0900 windowscodecs: Make JPEG decoder fallback to 96 dpi resolution for density_unit == 0 case. --- dlls/windowscodecs/jpegformat.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 6f2653d..c742f78 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -548,16 +548,23 @@ static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifa EnterCriticalSection(&This->lock); - if (This->cinfo.density_unit == 2) /* pixels per centimeter */ + switch (This->cinfo.density_unit) { + case 2: /* pixels per centimeter */ *pDpiX = This->cinfo.X_density * 2.54; *pDpiY = This->cinfo.Y_density * 2.54; - } - else - { - /* 1 = pixels per inch, 0 = unknown */ + break; + + case 1: /* pixels per inch */ *pDpiX = This->cinfo.X_density; *pDpiY = This->cinfo.Y_density; + break; + + case 0: /* unknown */ + default: + *pDpiX = 96.0; + *pDpiY = 96.0; + break; } LeaveCriticalSection(&This->lock);

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::name implementation.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 724b248f988b9a507c17b35ef80a6199960dcf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724b248f988b9a507c17b35ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 18 14:06:10 2013 +0100 mshtml: Added IHTMLButtonElement::name implementation. --- dlls/mshtml/htmlinput.c | 38 ++++++++++++++++++++++++++++++++------ dlls/mshtml/nsiface.idl | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 0ca0e76..d6bd394 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1417,6 +1417,8 @@ typedef struct { HTMLElement element; IHTMLButtonElement IHTMLButtonElement_iface; + + nsIDOMHTMLButtonElement *nsbutton; } HTMLButtonElement; static inline HTMLButtonElement *impl_from_IHTMLButtonElement(IHTMLButtonElement *iface) @@ -1504,15 +1506,33 @@ static HRESULT WINAPI HTMLButtonElement_get_value(IHTMLButtonElement *iface, BST static HRESULT WINAPI HTMLButtonElement_put_name(IHTMLButtonElement *iface, BSTR v) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&name_str, v); + nsres = nsIDOMHTMLButtonElement_SetName(This->nsbutton, &name_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("SetName failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLButtonElement_get_name(IHTMLButtonElement *iface, BSTR *p) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + nsres = nsIDOMHTMLButtonElement_GetName(This->nsbutton, &name_str); + return return_nsstr(nsres, &name_str, p); } static HRESULT WINAPI HTMLButtonElement_put_status(IHTMLButtonElement *iface, VARIANT v) @@ -1628,8 +1648,7 @@ static dispex_static_data_t HTMLButtonElement_dispex = { HRESULT HTMLButtonElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLButtonElement *ret; - - ERR("!!!\n"); + nsresult nsres; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) @@ -1639,6 +1658,13 @@ HRESULT HTMLButtonElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->element.node.vtbl = &HTMLButtonElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLButtonElement_dispex); + + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLButtonElement, (void**)&ret->nsbutton); + + /* Share nsbutton reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsbutton == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + *elem = &ret->element; return S_OK; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 647566f..76f8ed0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1690,6 +1690,41 @@ interface nsIDOMHTMLOptionElement : nsIDOMHTMLElement [ object, + uuid(8e40d4d7-c204-4192-802a-0b5602e9c669), + local +] +interface nsIDOMHTMLButtonElement : nsIDOMHTMLElement +{ + nsresult GetAutofocus(bool *aAutofocus); + nsresult SetAutofocus(bool aAutofocus); + nsresult GetDisabled(bool *aDisabled); + nsresult SetDisabled(bool aDisabled); + nsresult GetForm(nsIDOMHTMLFormElement **aForm); + nsresult GetFormAction(nsAString *aFormAction); + nsresult SetFormAction(const nsAString *aFormAction); + nsresult GetFormEnctype(nsAString *aFormEnctype); + nsresult SetFormEnctype(const nsAString *aFormEnctype); + nsresult GetFormMethod(nsAString *aFormMethod); + nsresult SetFormMethod(const nsAString *aFormMethod); + nsresult GetFormNoValidate(bool *aFormNoValidate); + nsresult SetFormNoValidate(bool aFormNoValidate); + nsresult GetFormTarget(nsAString *aFormTarget); + nsresult SetFormTarget(const nsAString *aFormTarget); + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetType(nsAString *aType); + nsresult SetType(const nsAString *aType); + nsresult GetValue(nsAString *aValue); + nsresult SetValue(const nsAString *aValue); + nsresult GetWillValidate(bool *aWillValidate); + nsresult GetValidity(nsIDOMValidityState **aValidity); + nsresult GetValidationMessage(nsAString *aValidationMessage); + nsresult CheckValidity(bool *_retval); + nsresult SetCustomValidity(const nsAString *error); +} + +[ + object, uuid(429b041b-06df-486c-9a3a-a1d901cc76a2), local ]

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::name tests.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 9fa1570fe67b067a83417e08807612612b8edce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa1570fe67b067a83417e088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 18 14:06:29 2013 +0100 mshtml: Added IHTMLButtonElement::name tests. --- dlls/mshtml/tests/dom.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2e4e3d8..54bb68c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -913,6 +913,17 @@ static IHTMLIFrameElement2 *_get_iframe2_iface(unsigned line, IUnknown *unk) return ret; } +#define get_button_iface(u) _get_button_iface(__LINE__,u) +static IHTMLButtonElement *_get_button_iface(unsigned line, IUnknown *unk) +{ + IHTMLButtonElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLButtonElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLButtonElement: %08x\n", hres); + return ret; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -5348,6 +5359,45 @@ static void test_defaults(IHTMLDocument2 *doc) test_doc_title(doc, ""); } +#define test_button_name(a,b) _test_button_name(__LINE__,a,b) +static void _test_button_name(unsigned line, IHTMLElement *elem, const char *exname) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLButtonElement_get_name(button, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(exname) + ok_(__FILE__,line)(!strcmp_wa(str, exname), "name = %s, expected %s\n", wine_dbgstr_w(str), exname); + else + ok_(__FILE__,line)(!str, "name = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + IHTMLButtonElement_Release(button); +} + +#define set_button_name(a,b) _set_button_name(__LINE__,a,b) +static void _set_button_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(name); + HRESULT hres; + + hres = IHTMLButtonElement_put_name(button, str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + SysFreeString(str); + IHTMLButtonElement_Release(button); + + _test_button_name(line, elem, name); +} + +static void test_button_elem(IHTMLElement *elem) +{ + test_button_name(elem, NULL); + set_button_name(elem, "button name"); +} + static void test_tr_elem(IHTMLElement *elem) { IHTMLElementCollection *col; @@ -6097,6 +6147,13 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "btnid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_button_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "objid"); ok(elem != NULL, "elem == NULL\n"); if(elem) {

1 0

Phil Krylov : usp10: Support GPOS extension lookup subtables.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: c9cbde73c014554eb43cc24564f59973e3b55bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9cbde73c014554eb43cc2456… Author: Phil Krylov <phil.krylov(a)gmail.com> Date: Fri Mar 8 20:24:59 2013 +0400 usp10: Support GPOS extension lookup subtables. --- dlls/usp10/opentype.c | 93 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a48a607..166d823 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -479,6 +479,12 @@ typedef struct { GPOS_PosLookupRecord PosLookupRecord[1]; } GPOS_ChainContextPosFormat3_4; +typedef struct { + WORD PosFormat; + WORD ExtensionLookupType; + DWORD ExtensionOffset; +} GPOS_ExtensionPosFormat1; + /********** * CMAP **********/ @@ -1166,6 +1172,25 @@ static VOID GPOS_get_value_record_offsets(const BYTE* head, GPOS_ValueRecord *Va if (ValueFormat & 0xFF00) FIXME("Unhandled Value Format %x\n",ValueFormat&0xFF00); } +static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) +{ + int offset = GET_BE_WORD(look->SubTable[index]); + + if (GET_BE_WORD(look->LookupType) == 9) + { + const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + offset); + if (GET_BE_WORD(ext->PosFormat) == 1) + { + offset += GET_BE_DWORD(ext->ExtensionOffset); + } + else + { + FIXME("Unhandled Extension Positioning Format %i\n",GET_BE_WORD(ext->PosFormat)); + } + } + return (const BYTE *)look + offset; +} + static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) { @@ -1175,9 +1200,8 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_SinglePosFormat1 *spf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - spf1 = (const GPOS_SinglePosFormat1*)((const BYTE*)look+offset); + const GPOS_SinglePosFormat1 *spf1 = (const GPOS_SinglePosFormat1*)GPOS_get_subtable(look, j); + WORD offset; if (GET_BE_WORD(spf1->PosFormat) == 1) { offset = GET_BE_WORD(spf1->Coverage); @@ -1253,9 +1277,8 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_PairPosFormat1 *ppf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - ppf1 = (const GPOS_PairPosFormat1*)((const BYTE*)look+offset); + const GPOS_PairPosFormat1 *ppf1 = (const GPOS_PairPosFormat1*)GPOS_get_subtable(look, j); + WORD offset; if (GET_BE_WORD(ppf1->PosFormat) == 1) { int index; @@ -1292,7 +1315,7 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN } else if (GET_BE_WORD(ppf1->PosFormat) == 2) { - const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)((const BYTE*)look + offset); + const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)ppf1; int index; WORD ValueFormat1 = GET_BE_WORD( ppf2->ValueFormat1 ); WORD ValueFormat2 = GET_BE_WORD( ppf2->ValueFormat2 ); @@ -1339,13 +1362,11 @@ static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIP for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - const GPOS_CursivePosFormat1 *cpf1; - WORD offset = GET_BE_WORD(look->SubTable[j]); - cpf1 = (const GPOS_CursivePosFormat1*)((const BYTE*)look+offset); + const GPOS_CursivePosFormat1 *cpf1 = (const GPOS_CursivePosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(cpf1->PosFormat) == 1) { int index_exit, index_entry; - offset = GET_BE_WORD( cpf1->Coverage ); + WORD offset = GET_BE_WORD( cpf1->Coverage ); index_exit = GSUB_is_glyph_covered((const BYTE*)cpf1+offset, glyphs[glyph_index]); if (index_exit != -1 && cpf1->EntryExitRecord[index_exit].ExitAnchor!= 0) { @@ -1389,10 +1410,7 @@ static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, c for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkBasePosFormat1 *mbpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mbpf1 = (const GPOS_MarkBasePosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkBasePosFormat1 *mbpf1 = (const GPOS_MarkBasePosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mbpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mbpf1->MarkCoverage); @@ -1466,10 +1484,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkLigPosFormat1 *mlpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mlpf1 = (const GPOS_MarkLigPosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkLigPosFormat1 *mlpf1 = (const GPOS_MarkLigPosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mlpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mlpf1->MarkCoverage); @@ -1560,10 +1575,7 @@ static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { - int offset; - const GPOS_MarkMarkPosFormat1 *mmpf1; - offset = GET_BE_WORD(look->SubTable[j]); - mmpf1 = (const GPOS_MarkMarkPosFormat1*)((const BYTE*)look+offset); + const GPOS_MarkMarkPosFormat1 *mmpf1 = (const GPOS_MarkMarkPosFormat1 *)GPOS_get_subtable(look, j); if (GET_BE_WORD(mmpf1->PosFormat) == 1) { int offset = GET_BE_WORD(mmpf1->Mark1Coverage); @@ -1590,7 +1602,7 @@ static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY ma = (const GPOS_MarkArray*)((const BYTE*)mmpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return FALSE; } mr = &ma->MarkRecord[mark_index]; @@ -1631,13 +1643,10 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) { int offset; - const GPOS_ChainContextPosFormat3_1 *ccpf3; + const GPOS_ChainContextPosFormat3_1 *ccpf3 = (GPOS_ChainContextPosFormat3_1 *)GPOS_get_subtable(look, j); int dirLookahead = write_dir; int dirBacktrack = -1 * write_dir; - offset = GET_BE_WORD(look->SubTable[j]); - ccpf3 = (const GPOS_ChainContextPosFormat3_1*)((const BYTE*)look+offset); - if (GET_BE_WORD(ccpf3->PosFormat) == 1) { FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); @@ -1723,11 +1732,33 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG int offset; const OT_LookupTable *look; int ppem = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; + WORD type; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); - TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - switch(GET_BE_WORD(look->LookupType)) + type = GET_BE_WORD(look->LookupType); + TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + if (type == 9) + { + if (GET_BE_WORD(look->SubTableCount)) + { + const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + GET_BE_WORD(look->SubTable[0])); + if (GET_BE_WORD(ext->PosFormat) == 1) + { + type = GET_BE_WORD(ext->ExtensionLookupType); + TRACE("extension type %i\n",type); + } + else + { + FIXME("Unhandled Extension Positioning Format %i\n",GET_BE_WORD(ext->PosFormat)); + } + } + else + { + WARN("lookup type is Extension Positioning but no extension subtable exists\n"); + } + } + switch (type) { case 1: { @@ -1849,7 +1880,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); } default: - FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); + FIXME("We do not handle SubType %i\n",type); } return glyph_index+1; }

1 0

Aric Stewart : usp10: Correct access to -1 index of array.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: e909665db34b44c127c5ecefdfbd2991af5d2029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e909665db34b44c127c5ecefd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 18 11:21:15 2013 -0500 usp10: Correct access to -1 index of array. Issue found by Phil Krylov. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index bc48ecd..878c39f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1341,7 +1341,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, if (original == Script_Punctuation2) break; } - if (scriptInformation[scripts[j]].props.fComplex || asian) + if (j >= 0 && (scriptInformation[scripts[j]].props.fComplex || asian)) scripts[i] = scripts[j]; } }

1 0

Piotr Caban : msvcp90: Added time_put class stub.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 38302c20f040589ff83cd10618c4448d0524b766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38302c20f040589ff83cd1061… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:37:36 2013 +0100 msvcp90: Added time_put class stub. --- dlls/msvcp90/locale.c | 315 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 128 +++++++++--------- 2 files changed, 379 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38302c20f040589ff83cd…

1 0

Piotr Caban : msvcp90: Added time_put class implementation.
by Alexandre Julliard 25 Mar '13

25 Mar '13

Module: wine Branch: master Commit: 889786edd19a2d13125e53b568bfcf58e3e8e6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889786edd19a2d13125e53b56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:37:48 2013 +0100 msvcp90: Added time_put class implementation. --- dlls/msvcp90/locale.c | 254 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 205 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=889786edd19a2d13125e5…

1 0