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

Andrew Eikum : oleaut32: Always read all imports from the typelib.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 9afd5845e58b0a90f14c87121d4abc0f3ee85eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afd5845e58b0a90f14c87121… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:57:44 2013 -0500 oleaut32: Always read all imports from the typelib. --- dlls/oleaut32/typelib.c | 139 ++++++++++++++--------------------------------- 1 files changed, 42 insertions(+), 97 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 959c87b..4a98952 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1223,8 +1223,6 @@ typedef struct tagTLBContext } TLBContext; -static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, int offset); - static inline BSTR TLB_get_bstr(const TLBString *str) { return str != NULL ? str->str : NULL; @@ -2206,40 +2204,9 @@ static void MSFT_GetTdesc(TLBContext *pcx, INT type, TYPEDESC *pTd, else *pTd=pcx->pLibInfo->pTypeDesc[type/(2*sizeof(INT))]; - if(pTd->vt == VT_USERDEFINED) - MSFT_DoRefType(pcx, pTI->pTypeLib, pTd->u.hreftype); - TRACE_(typelib)("vt type = %X\n", pTd->vt); } -static void MSFT_ResolveReferencedTypes(TLBContext *pcx, ITypeInfoImpl *pTI, TYPEDESC *lpTypeDesc) -{ - /* resolve referenced type if any */ - while (lpTypeDesc) - { - switch (lpTypeDesc->vt) - { - case VT_PTR: - lpTypeDesc = lpTypeDesc->u.lptdesc; - break; - - case VT_CARRAY: - lpTypeDesc = & (lpTypeDesc->u.lpadesc->tdescElem); - break; - - case VT_USERDEFINED: - MSFT_DoRefType(pcx, pTI->pTypeLib, - lpTypeDesc->u.hreftype); - - lpTypeDesc = NULL; - break; - - default: - lpTypeDesc = NULL; - } - } -} - static int TLB_is_propgetput(INVOKEKIND invkind) { return (invkind == INVOKE_PROPERTYGET || @@ -2364,7 +2331,6 @@ MSFT_DoFuncs(TLBContext* pcx, pFuncRec->DataType, &ptfd->funcdesc.elemdescFunc.tdesc, pTI); - MSFT_ResolveReferencedTypes(pcx, pTI, &ptfd->funcdesc.elemdescFunc.tdesc); /* do the parameters/arguments */ if(pFuncRec->nrargs) @@ -2397,8 +2363,6 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadName( pcx, paraminfo.oName ); TRACE_(typelib)("param[%d] = %s\n", j, debugstr_w(TLB_get_bstr(ptfd->pParamDesc[j].Name))); - MSFT_ResolveReferencedTypes(pcx, pTI, &elemdesc->tdesc); - /* default value */ if ( (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) && (pFuncRec->FKCCIC & 0x1000) ) @@ -2501,66 +2465,10 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, pVarRec->OffsValue, pcx); } else ptvd->vardesc.u.oInst=pVarRec->OffsValue; - MSFT_ResolveReferencedTypes(pcx, pTI, &ptvd->vardesc.elemdescVar.tdesc); recoffset += reclength; } } -/* fill in data for a hreftype (offset). When the referenced type is contained - * in the typelib, it's just an (file) offset in the type info base dir. - * If comes from import, it's an offset+1 in the ImpInfo table - * */ -static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, - int offset) -{ - TLBRefType *ref; - - TRACE_(typelib)("TLB context %p, TLB offset %x\n", pcx, offset); - - LIST_FOR_EACH_ENTRY(ref, &pTL->ref_list, TLBRefType, entry) - { - if(ref->reference == offset) return; - } - - ref = heap_alloc_zero(sizeof(TLBRefType)); - list_add_tail(&pTL->ref_list, &ref->entry); - - if(!MSFT_HREFTYPE_INTHISFILE( offset)) { - /* external typelib */ - MSFT_ImpInfo impinfo; - TLBImpLib *pImpLib; - - TRACE_(typelib)("offset %x, masked offset %x\n", offset, offset + (offset & 0xfffffffc)); - - MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx, - pcx->pTblDir->pImpInfo.offset + (offset & 0xfffffffc)); - - LIST_FOR_EACH_ENTRY(pImpLib, &pcx->pLibInfo->implib_list, TLBImpLib, entry) - if(pImpLib->offset==impinfo.oImpFile) - break; - - if(&pImpLib->entry != &pcx->pLibInfo->implib_list){ - ref->reference = offset & (~0x3); - ref->pImpTLInfo = pImpLib; - if(impinfo.flags & MSFT_IMPINFO_OFFSET_IS_GUID) { - ref->guid = MSFT_ReadGuid(impinfo.oGuid, pcx); - TRACE("importing by guid %s\n", debugstr_guid(TLB_get_guidref(ref->guid))); - ref->index = TLB_REF_USE_GUID; - } else - ref->index = impinfo.oGuid; - }else{ - ERR("Cannot find a reference\n"); - ref->reference = -1; - ref->pImpTLInfo = TLB_REF_NOT_FOUND; - } - }else{ - /* in this typelib */ - ref->index = MSFT_HREFTYPE_INDEX(offset); - ref->reference = offset; - ref->pImpTLInfo = TLB_REF_INTERNAL; - } -} - /* process Implemented Interfaces of a com class */ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, int offset) @@ -2576,7 +2484,6 @@ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, for(i=0;i<count;i++){ if(offset<0) break; /* paranoia */ MSFT_ReadLEDWords(&refrec,sizeof(refrec),pcx,offset+pcx->pTblDir->pRefTab.offset); - MSFT_DoRefType(pcx, pTI->pTypeLib, refrec.reftype); pImpl->hRef = refrec.reftype; pImpl->implflags=refrec.flags; MSFT_CustData(pcx, refrec.oCustData, &pImpl->custdata_list); @@ -2668,12 +2575,10 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( { ptiRet->impltypes = TLBImplType_Alloc(1); ptiRet->impltypes[0].hRef = tiBase.datatype1; - MSFT_DoRefType(pcx, pLibInfo, tiBase.datatype1); } break; default: ptiRet->impltypes = TLBImplType_Alloc(1); - MSFT_DoRefType(pcx, pLibInfo, tiBase.datatype1); ptiRet->impltypes[0].hRef = tiBase.datatype1; break; } @@ -2735,6 +2640,46 @@ static HRESULT MSFT_ReadAllStrings(TLBContext *pcx) } } +static HRESULT MSFT_ReadAllRefs(TLBContext *pcx) +{ + TLBRefType *ref; + int offs = 0; + + MSFT_Seek(pcx, pcx->pTblDir->pImpInfo.offset); + while (offs < pcx->pTblDir->pImpInfo.length) { + MSFT_ImpInfo impinfo; + TLBImpLib *pImpLib; + + MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx, DO_NOT_SEEK); + + ref = heap_alloc_zero(sizeof(TLBRefType)); + list_add_tail(&pcx->pLibInfo->ref_list, &ref->entry); + + LIST_FOR_EACH_ENTRY(pImpLib, &pcx->pLibInfo->implib_list, TLBImpLib, entry) + if(pImpLib->offset==impinfo.oImpFile) + break; + + if(&pImpLib->entry != &pcx->pLibInfo->implib_list){ + ref->reference = offs; + ref->pImpTLInfo = pImpLib; + if(impinfo.flags & MSFT_IMPINFO_OFFSET_IS_GUID) { + ref->guid = MSFT_ReadGuid(impinfo.oGuid, pcx); + TRACE("importing by guid %s\n", debugstr_guid(TLB_get_guidref(ref->guid))); + ref->index = TLB_REF_USE_GUID; + } else + ref->index = impinfo.oGuid; + }else{ + ERR("Cannot find a reference\n"); + ref->reference = -1; + ref->pImpTLInfo = TLB_REF_NOT_FOUND; + } + + offs += sizeof(impinfo); + } + + return S_OK; +} + /* Because type library parsing has some degree of overhead, and some apps repeatedly load the same * typelibs over and over, we cache them here. According to MSDN Microsoft have a similar scheme in * place. This will cause a deliberate memory leak, but generally losing RAM for cycles is an acceptable @@ -3501,9 +3446,9 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) } } + MSFT_ReadAllRefs(&cx); + pTypeLibImpl->dispatch_href = tlbHeader.dispatchpos; - if(pTypeLibImpl->dispatch_href != -1) - MSFT_DoRefType(&cx, pTypeLibImpl, pTypeLibImpl->dispatch_href); /* type infos */ if(tlbHeader.nrtypeinfos >= 0 )

1 0

Ričardas Barkauskas : wininet/tests: Test some connection closing specifics.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: 188b39ab2b8ffebd1e1dbe80b77d43867606a4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=188b39ab2b8ffebd1e1dbe80b… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Jun 5 18:35:41 2013 +0300 wininet/tests: Test some connection closing specifics. --- dlls/wininet/tests/http.c | 179 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 171 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=188b39ab2b8ffebd1e1db…

1 0

Gurmail Bassi : dinput: Use a properly initialized format in SetProperty.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: c34b7b13134e2479d3e25e8f8995ff5a8abd2983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34b7b13134e2479d3e25e8f8… Author: Gurmail Bassi <Gurmail.Bassi(a)mottmac.com> Date: Tue Jun 4 21:38:38 2013 +0100 dinput: Use a properly initialized format in SetProperty. --- dlls/dinput/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index b929c05..ce267e6 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -301,7 +301,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF remap_props.lMin = pr->lMin; remap_props.lMax = pr->lMax; - switch (This->base.data_format.offsets[i]) { + switch (This->base.data_format.wine_df->rgodf[i].dwOfs) { case DIJOFS_X : This->js.lX = joystick_map_axis(&remap_props, This->js.lX); break; case DIJOFS_Y : This->js.lY = joystick_map_axis(&remap_props, This->js.lY); break; case DIJOFS_Z : This->js.lZ = joystick_map_axis(&remap_props, This->js.lZ); break;

1 0

Sergey Guralnik : user32/tests: Test MDI child order changing caused by WM_MDINEXT.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: fe2f877678a52e65b0c51a2aaa3ffc319f869330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f877678a52e65b0c51a2aa… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jun 5 09:12:03 2013 +0300 user32/tests: Test MDI child order changing caused by WM_MDINEXT. --- dlls/user32/tests/win.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 20d8d9f..a9467ce 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1507,6 +1507,69 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) DestroyWindow(mdi_child); } +static void test_MDI_child_stack(HWND mdi_client) +{ + HWND child_1, child_2, child_3, child_4; + HWND stack[4]; + MDICREATESTRUCTA cs; + + cs.szClass = "MDI_child_Class_1"; + cs.szTitle = "MDI child"; + cs.hOwner = GetModuleHandleA(0); + cs.x = CW_USEDEFAULT; + cs.y = CW_USEDEFAULT; + cs.cx = CW_USEDEFAULT; + cs.cy = CW_USEDEFAULT; + cs.style = 0; + cs.lParam = (LPARAM)mdi_lParam_test_message; + + assert(child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + assert(child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + assert(child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + assert(child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); + trace("Initial MDI child stack: %p->%p->%p->%p\n", stack[0], stack[1], stack[2], stack[3]); + ok(stack[0] == child_4 && stack[1] == child_3 && + stack[2] == child_2 && stack[3] == child_1, + "Unexpected initial order, should be: %p->%p->%p->%p\n", + child_4, child_3, child_2, child_1); + + trace("Activate child next to %p\n", child_3); + SendMessage(mdi_client, WM_MDINEXT, (WPARAM)child_3, 0); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); +todo_wine + ok(stack[0] == child_2 && stack[1] == child_4 && + stack[2] == child_1 && stack[3] == child_3, + "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", + child_2, child_4, child_1, child_3, stack[0], stack[1], stack[2], stack[3]); + + trace("Activate child previous to %p\n", child_1); + SendMessage(mdi_client, WM_MDINEXT, (WPARAM)child_1, 1); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); +todo_wine + ok(stack[0] == child_4 && stack[1] == child_2 && + stack[2] == child_1 && stack[3] == child_3, + "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", + child_4, child_2, child_1, child_3, stack[0], stack[1], stack[2], stack[3]); + + DestroyWindow(child_1); + DestroyWindow(child_2); + DestroyWindow(child_3); + DestroyWindow(child_4); +} + /********************************************************************** * MDI_ChildGetMinMaxInfo (copied from windows/mdi.c) * @@ -1788,6 +1851,17 @@ static LRESULT WINAPI mdi_main_wnd_procA(HWND hwnd, UINT msg, WPARAM wparam, LPA assert(mdi_client); test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); DestroyWindow(mdi_client); + + /* Test child window stack management */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD, + 0, 0, rc.right, rc.bottom, + hwnd, 0, GetModuleHandle(0), + &client_cs); + assert(mdi_client); + test_MDI_child_stack(mdi_client); + DestroyWindow(mdi_client); break; }

1 0

Aric Stewart : gdi32: Turn off tategaki if the unicode code point is outside of the rotated ranges .
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: ceb81eee206918e95ce13ab823fa3c57d86078fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb81eee206918e95ce13ab82… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 4 09:05:50 2013 -0500 gdi32: Turn off tategaki if the unicode code point is outside of the rotated ranges. --- dlls/gdi32/freetype.c | 74 +++++++++++++++++++++++++++++++++++++++++------ dlls/gdi32/tests/font.c | 2 +- 2 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bf4e4c3..f884307 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -537,7 +537,7 @@ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N' static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; static BOOL use_default_fallback = FALSE; -static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); +static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph, BOOL *vert); static BOOL get_outline_text_metrics(GdiFont *font); static BOOL get_bitmap_text_metrics(GdiFont *font); static BOOL get_text_metrics(GdiFont *font, LPTEXTMETRICW ptm); @@ -585,7 +585,6 @@ static const WCHAR internal_system_link[] = {'S','o','f','t','w','a','r','e','\\ /* These are all structures needed for the GSUB table */ #define GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') -#define TATEGAKI_LOWER_BOUND 0x02F1 typedef struct { DWORD version; @@ -5903,6 +5902,55 @@ static inline BYTE get_max_level( UINT format ) return 255; } +static const struct { WCHAR lower; WCHAR upper;} unrotate_ranges[] = + { + {0x0000, 0x10FF}, + /* Hangul Jamo */ + {0x1200, 0x17FF}, + /* Mongolian */ + {0x18B0, 0x1FFF}, + /* General Punctuation */ + {0x2070, 0x209F}, + /* Currency Symbols */ + /* Combining Diacritical Marks for Symbols */ + /* Letterlike Symbols */ + {0x2150, 0x245F}, + /* Enclosed Alphanumerics */ + {0x2500, 0x259F}, + /* Geometric Shapes */ + /* Miscellaneous Symbols */ + /* Dingbats */ + /* Miscellaneous Mathematical Symbols-A */ + /* Supplemental Arrows-A */ + {0x2800, 0x2E7F}, + /* East Asian scripts and symbols */ + {0xA000, 0xABFF}, + /* Hangul Syllables */ + /* Hangul Jamo Extended-B */ + {0xD800, 0xF8FF}, + /* CJK Compatibility Ideographs */ + {0xFB00, 0xFE0F}, + /* Vertical Forms */ + /* Combining Half Marks */ + /* CJK Compatibility Forms */ + {0xFE50, 0xFEFF}, + /* Halfwidth and Fullwidth Forms */ + {0xFFEF, 0xFFFF}, + }; + +static BOOL check_unicode_tategaki(WCHAR uchar) +{ + int i; + for (i = 0 ;; i++) + { + if (uchar < unrotate_ranges[i].lower) + return TRUE; + + if (uchar >= unrotate_ranges[i].lower && uchar <= unrotate_ranges[i].upper) + return FALSE; + } +} + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, @@ -5943,10 +5991,17 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, glyph_index = glyph; original_index = glyph; format &= ~GGO_GLYPH_INDEX; + /* TODO: Window also turns off tategaki for glyphs passed in by index + if their unicode code points fall outside of the range that is + rotated. */ } else { - get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index); + BOOL vert; + get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index, &vert); ft_face = font->ft_face; original_index = glyph_index; + /* We know what unicode ranges get rotated */ + if (!vert && tategaki) + tategaki = check_unicode_tategaki(glyph); } if(format & GGO_UNHINTED) { @@ -5954,10 +6009,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, format &= ~GGO_UNHINTED; } - /* tategaki never appears to happen to lower glyph index */ - if (glyph_index < TATEGAKI_LOWER_BOUND ) - tategaki = FALSE; - if(original_index >= font->gmsize * GM_BLOCK_SIZE) { font->gmsize = (original_index / GM_BLOCK_SIZE + 1); font->gm = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, font->gm, @@ -7348,9 +7399,9 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) return TRUE; } -static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph) +static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph, BOOL* vert) { - FT_UInt g; + FT_UInt g,o; CHILD_FONT *child_font; if(font->base_font) @@ -7360,7 +7411,9 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, if((*glyph = get_glyph_index(font, c))) { + o = *glyph; *glyph = get_GSUB_vert_glyph(font, *glyph); + *vert = (o != *glyph); return TRUE; } @@ -7373,15 +7426,18 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, if(!child_font->font->ft_face) continue; g = get_glyph_index(child_font->font, c); + o = g; g = get_GSUB_vert_glyph(child_font->font, g); if(g) { *glyph = g; *linked_font = child_font->font; + *vert = (o != g); return TRUE; } } *glyph = get_default_char_index(font); + *vert = FALSE; return FALSE; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b57a630..087d572 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4831,7 +4831,7 @@ static void test_vertical_font(void) check_vertical_font("@WineTestVertical", &installed, &selected, &gm, &vgi); ok(installed, "@WineTestVertical is not installed\n"); ok(selected, "@WineTestVertical is not selected\n"); - todo_wine ok(gm.gmBlackBoxX > gm.gmBlackBoxY, + ok(gm.gmBlackBoxX > gm.gmBlackBoxY, "gmBlackBoxX(%u) should be less than gmBlackBoxY(%u) if vertical\n", gm.gmBlackBoxX, gm.gmBlackBoxY);

1 0

Qian Hong : explorer: Create non-existent folders when initializing launchers.
by Alexandre Julliard 05 Jun '13

05 Jun '13

Module: wine Branch: master Commit: c8d1d4aadc842a7911d1d3ab142d4cc4e32ff106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1d4aadc842a7911d1d3ab1… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sun Jun 2 03:20:03 2013 +0800 explorer: Create non-existent folders when initializing launchers. --- programs/explorer/desktop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index e426c1a..c975e23 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -444,13 +444,13 @@ static void initialize_launchers( HWND hwnd ) desktop_width = GetSystemMetrics( SM_CXSCREEN ); launchers_per_row = desktop_width / launcher_size; - hr = SHGetKnownFolderPath( &FOLDERID_Desktop, 0, NULL, &desktop_folder ); + hr = SHGetKnownFolderPath( &FOLDERID_Desktop, KF_FLAG_CREATE, NULL, &desktop_folder ); if (FAILED( hr )) { WINE_ERR("Could not get user desktop folder\n"); return; } - hr = SHGetKnownFolderPath( &FOLDERID_PublicDesktop, 0, NULL, &desktop_folder_public ); + hr = SHGetKnownFolderPath( &FOLDERID_PublicDesktop, KF_FLAG_CREATE, NULL, &desktop_folder_public ); if (FAILED( hr )) { WINE_ERR("Could not get public desktop folder\n");

1 0

Alistair Leslie-Hughes : oleaut32/tests: Correct output arguments.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 6d1db050d28bcb149d16d5186d33fd20492347fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1db050d28bcb149d16d5186… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 3 08:51:07 2013 +1000 oleaut32/tests: Correct output arguments. --- dlls/oleaut32/tests/vartest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c7b46db..0d38b9d 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5510,7 +5510,7 @@ static void test_VarCat(void) /* Determine the error code for the vt combination */ ok(hres == expected_error_num, "VarCat: %d, %d returned error, 0x%X expected 0x%X.\n", - leftvt, rightvt, expected_error_num, hres); + leftvt, rightvt, hres, expected_error_num); /* Check types are correct */ ok(V_VT(&result) == resultvt,

1 0

Piotr Caban : msvcrt: Reuse FILE object in wfreopen function.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 598ff4dd5a44e1632e9eb2bf6d59a2a363afe854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598ff4dd5a44e1632e9eb2bf6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 11:16:50 2013 +0200 msvcrt: Reuse FILE object in wfreopen function. --- dlls/msvcrt/file.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c0c7124..1f17a93 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3797,20 +3797,28 @@ MSVCRT_size_t CDECL fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t ele */ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, MSVCRT_FILE* file) { - int fd; + int open_flags, stream_flags, fd; - TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); + TRACE(":path (%s) mode (%s) file (%p) fd (%d)\n", debugstr_w(path), debugstr_w(mode), file, file->_file); - LOCK_FILES(); - if (!file || ((fd = file->_file) < 0) || fd > MSVCRT_fdend) - file = NULL; - else - { - MSVCRT_fclose(file); - file = MSVCRT__wfsopen(path, mode, MSVCRT__SH_DENYNO); - } - UNLOCK_FILES(); - return file; + LOCK_FILES(); + if (!file || ((fd = file->_file) < 0) || fd > MSVCRT_fdend) + file = NULL; + else + { + MSVCRT_fclose(file); + if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) + file = NULL; + else if((fd = MSVCRT__wopen(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) < 0) + file = NULL; + else if(msvcrt_init_fp(file, fd, stream_flags) == -1) + { + file->_flag = 0; + file = NULL; + } + } + UNLOCK_FILES(); + return file; } /*********************************************************************

1 0

Ken Thomases : winemac: Don' t unminimize a window on first activation during start-up.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 4c651e39e4721166ef4024380ad09e8ecd4ad754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c651e39e4721166ef4024380… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:37 2013 -0500 winemac: Don't unminimize a window on first activation during start-up. --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 681ef52..1338137 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -81,6 +81,8 @@ enum { NSTimeInterval lastEventTapEventTime; NSImage* applicationIcon; + + BOOL beenActive; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4a54f66..9984114 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1707,7 +1707,7 @@ int macdrv_err_on; [self adjustWindowLevels:YES]; - if (![self frontWineWindow]) + if (beenActive && ![self frontWineWindow]) { for (WineWindow* window in [NSApp windows]) { @@ -1718,6 +1718,7 @@ int macdrv_err_on; } } } + beenActive = TRUE; // If a Wine process terminates abruptly while it has the display captured // and switched to a different resolution, Mac OS X will uncapture the

1 0

Ken Thomases : winemac: Don' t accidentally unminimize a window when trying to change z-order.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 841f158d81ab3555f67c24a824df2de618c139ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=841f158d81ab3555f67c24a82… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:39 2013 -0500 winemac: Don't accidentally unminimize a window when trying to change z-order. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 5ee1aac..2da8a08 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -708,7 +708,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { WineApplicationController* controller = [WineApplicationController sharedController]; BOOL on_screen = frame_intersects_screens([self frame], [NSScreen screens]); - if (on_screen) + if (on_screen && ![self isMiniaturized]) { BOOL needAdjustWindowLevels = FALSE;

1 0