December 2012 - Wine-commits

Huw Davies : usp10: Glyph class tables are just generic class tables.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 79cbcf96123991496d064391c346223971d08e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79cbcf96123991496d064391c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 12:55:32 2012 +0000 usp10: Glyph class tables are just generic class tables. --- dlls/usp10/opentype.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 81135b8..edaf917 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -93,19 +93,19 @@ typedef struct { WORD StartGlyph; WORD GlyphCount; WORD ClassValueArray[1]; -} GDEF_ClassDefFormat1; +} OT_ClassDefFormat1; typedef struct { WORD Start; WORD End; WORD Class; -} GDEF_ClassRangeRecord; +} OT_ClassRangeRecord; typedef struct { WORD ClassFormat; WORD ClassRangeCount; - GDEF_ClassRangeRecord ClassRangeRecord[1]; -} GDEF_ClassDefFormat2; + OT_ClassRangeRecord ClassRangeRecord[1]; +} OT_ClassDefFormat2; /* These are all structures needed for the GSUB table */ @@ -525,20 +525,13 @@ DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWOR * GDEF **********/ -static WORD GDEF_get_glyph_class(const GDEF_Header *header, WORD glyph) +static WORD OT_get_glyph_class(const void *table, WORD glyph) { - int offset; WORD class = 0; - const GDEF_ClassDefFormat1 *cf1; - - if (!header) - return 0; + const OT_ClassDefFormat1 *cf1 = table; - offset = GET_BE_WORD(header->GlyphClassDef); - if (!offset) - return 0; + if (!table) return 0; - cf1 = (GDEF_ClassDefFormat1*)(((BYTE*)header)+offset); if (GET_BE_WORD(cf1->ClassFormat) == 1) { if (glyph >= GET_BE_WORD(cf1->StartGlyph)) @@ -550,7 +543,7 @@ static WORD GDEF_get_glyph_class(const GDEF_Header *header, WORD glyph) } else if (GET_BE_WORD(cf1->ClassFormat) == 2) { - const GDEF_ClassDefFormat2 *cf2 = (GDEF_ClassDefFormat2*)cf1; + const OT_ClassDefFormat2 *cf2 = table; int i, top; top = GET_BE_WORD(cf2->ClassRangeCount); for (i = 0; i < top; i++) @@ -585,10 +578,19 @@ static VOID *load_gdef_table(HDC hdc) void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) { int i; + void *glyph_class_table = NULL; if (!psc->GDEF_Table) psc->GDEF_Table = load_gdef_table(hdc); + if (psc->GDEF_Table) + { + const GDEF_Header *header = psc->GDEF_Table; + WORD offset = GET_BE_WORD( header->GlyphClassDef ); + if (offset) + glyph_class_table = (BYTE *)psc->GDEF_Table + offset; + } + for (i = 0; i < cGlyphs; i++) { WORD class; @@ -602,7 +604,7 @@ void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGly char_count++; } - class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); + class = OT_get_glyph_class( glyph_class_table, pwGlyphs[i] ); switch (class) {

1 0

Huw Davies : usp10: Move the application of pair values to a helper function.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 08fcdd5f6f2a31704ac964137d5f55b0fe86c504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08fcdd5f6f2a31704ac964137… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 12:55:33 2012 +0000 usp10: Move the application of pair values to a helper function. --- dlls/usp10/opentype.c | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index edaf917..45d28ef 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1186,6 +1186,30 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const WORD * } } +static void apply_pair_value( const void *pos_table, WORD val_fmt1, WORD val_fmt2, const WORD *pair, + INT ppem, POINT *adjust, POINT *advance ) +{ + GPOS_ValueRecord val_rec1 = {0,0,0,0,0,0,0,0}; + GPOS_ValueRecord val_rec2 = {0,0,0,0,0,0,0,0}; + INT size; + + size = GPOS_get_value_record( val_fmt1, pair, &val_rec1 ); + GPOS_get_value_record( val_fmt2, pair + size, &val_rec2 ); + + if (val_fmt1) + { + GPOS_get_value_record_offsets( pos_table, &val_rec1, val_fmt1, ppem, adjust, advance ); + TRACE( "Glyph 1 resulting cumulative offset is %i,%i design units\n", adjust[0].x, adjust[0].y ); + TRACE( "Glyph 1 resulting cumulative advance is %i,%i design units\n", advance[0].x, advance[0].y ); + } + if (val_fmt2) + { + GPOS_get_value_record_offsets( pos_table, &val_rec2, val_fmt2, ppem, adjust + 1, advance + 1 ); + TRACE( "Glyph 2 resulting cumulative offset is %i,%i design units\n", adjust[1].x, adjust[1].y ); + TRACE( "Glyph 2 resulting cumulative advance is %i,%i design units\n", advance[1].x, advance[1].y ); + } +} + static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) { int j; @@ -1222,28 +1246,10 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *gly if (glyphs[glyph_index+write_dir] == second_glyph) { int next = 1; - GPOS_ValueRecord ValueRecord1 = {0,0,0,0,0,0,0,0}; - GPOS_ValueRecord ValueRecord2 = {0,0,0,0,0,0,0,0}; - TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); - - GPOS_get_value_record(ValueFormat1, pair_val_rec->Value1, &ValueRecord1); - GPOS_get_value_record(ValueFormat2, pair_val_rec->Value1 + val_fmt1_size, &ValueRecord2); - if (ValueFormat1) - { - GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord1, ValueFormat1, ppem, &ptAdjust[0], &ptAdvance[0]); - TRACE("Glyph 1 resulting cumulative offset is %i,%i design units\n",ptAdjust[0].x,ptAdjust[0].y); - TRACE("Glyph 1 resulting cumulative advance is %i,%i design units\n",ptAdvance[0].x,ptAdvance[0].y); - } - if (ValueFormat2) - { - GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord2, ValueFormat2, ppem, &ptAdjust[1], &ptAdvance[1]); - TRACE("Glyph 2 resulting cumulative offset is %i,%i design units\n",ptAdjust[1].x,ptAdjust[1].y); - TRACE("Glyph 2 resulting cumulative advance is %i,%i design units\n",ptAdvance[1].x,ptAdvance[1].y); - next++; - } - if (next) - return glyph_index + next; + apply_pair_value( ppf1, ValueFormat1, ValueFormat2, pair_val_rec->Value1, ppem, ptAdjust, ptAdvance ); + if (ValueFormat2) next++; + return glyph_index + next; } pair_val_rec = (const GPOS_PairValueRecord *)(pair_val_rec->Value1 + val_fmt1_size + val_fmt2_size); }

1 0

Huw Davies : usp10: Add support for format 2 pair adjustments.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: 496898db510a3a38483d25ed3f1afbf76016500a URL: http://source.winehq.org/git/wine.git/?a=commit;h=496898db510a3a38483d25ed3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 12:55:34 2012 +0000 usp10: Add support for format 2 pair adjustments. --- dlls/usp10/opentype.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 45d28ef..10edc23 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -352,6 +352,18 @@ typedef struct { } GPOS_PairPosFormat1; typedef struct { + WORD PosFormat; + WORD Coverage; + WORD ValueFormat1; + WORD ValueFormat2; + WORD ClassDef1; + WORD ClassDef2; + WORD Class1Count; + WORD Class2Count; + WORD Class1Record[1]; +} GPOS_PairPosFormat2; + +typedef struct { WORD SecondGlyph; WORD Value1[1]; WORD Value2[1]; @@ -1255,6 +1267,37 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *gly } } } + else if (GET_BE_WORD(ppf1->PosFormat) == 2) + { + const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)((const BYTE*)look + offset); + int index; + WORD ValueFormat1 = GET_BE_WORD( ppf2->ValueFormat1 ); + WORD ValueFormat2 = GET_BE_WORD( ppf2->ValueFormat2 ); + INT val_fmt1_size = GPOS_get_value_record( ValueFormat1, NULL, NULL ); + INT val_fmt2_size = GPOS_get_value_record( ValueFormat2, NULL, NULL ); + WORD class1_count = GET_BE_WORD( ppf2->Class1Count ); + WORD class2_count = GET_BE_WORD( ppf2->Class2Count ); + + offset = GET_BE_WORD( ppf2->Coverage ); + index = GSUB_is_glyph_covered( (const BYTE*)ppf2 + offset, glyphs[glyph_index] ); + if (index != -1) + { + WORD class1, class2; + class1 = OT_get_glyph_class( (const BYTE *)ppf2 + GET_BE_WORD(ppf2->ClassDef1), glyphs[glyph_index] ); + class2 = OT_get_glyph_class( (const BYTE *)ppf2 + GET_BE_WORD(ppf2->ClassDef2), glyphs[glyph_index + write_dir] ); + if (class1 < class1_count && class2 < class2_count) + { + const WORD *pair_val = ppf2->Class1Record + (class1 * class2_count + class2) * (val_fmt1_size + val_fmt2_size); + int next = 1; + + TRACE( "Format 2: Found Pair %x,%x\n", glyphs[glyph_index], glyphs[glyph_index + write_dir] ); + + apply_pair_value( ppf2, ValueFormat1, ValueFormat2, pair_val, ppem, ptAdjust, ptAdvance ); + if (ValueFormat2) next++; + return glyph_index + next; + } + } + } else FIXME("Pair Adjustment Positioning: Format %i Unhandled\n",GET_BE_WORD(ppf1->PosFormat)); }

1 0

Jörg Höhle : mmdevapi: Avoid lock contention after SetEvent.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Module: wine Branch: master Commit: a39e423f6f6d2d61eb4bdc052d2ea2ab219325e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39e423f6f6d2d61eb4bdc052… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Dec 9 22:56:40 2012 +0100 mmdevapi: Avoid lock contention after SetEvent. --- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- dlls/wineoss.drv/mmdevdrv.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3e8ad8d..8c905e9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2137,12 +2137,12 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) alsa_write_data(This); else if(This->dataflow == eCapture) alsa_read_data(This); - - if(This->event) - SetEvent(This->event); } LeaveCriticalSection(&This->lock); + + if(This->event) + SetEvent(This->event); } static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 4de5ae6..ea6d452 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1481,12 +1481,12 @@ static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) oss_write_data(This); else if(This->dataflow == eCapture) oss_read_data(This); - - if(This->event) - SetEvent(This->event); } LeaveCriticalSection(&This->lock); + + if(This->event) + SetEvent(This->event); } static HRESULT WINAPI AudioClient_Start(IAudioClient *iface)

1 0

Detlef Riekenberg : api-ms-win-downlevel-shlwapi-l1-1-0: Add dll.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: 8ca7a068f4982a8c261604a8c4f7d1c3acbd8edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca7a068f4982a8c261604a8c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 17 11:37:46 2012 +0100 api-ms-win-downlevel-shlwapi-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 155 ++++++++++++++++++++ tools/make_specfiles | 4 + 5 files changed, 164 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ca7a068f4982a8c26160…

1 0

Jacek Caban : atl100: Added AtlWinModuleExtractCreateWndData implementation .
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: c0456aea76bcd8ce77d7c91dfc95a5ff8670e344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0456aea76bcd8ce77d7c91df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:16:57 2012 +0100 atl100: Added AtlWinModuleExtractCreateWndData implementation. --- dlls/atl100/atl.c | 28 ++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index bd3fbf1..570fe5c 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -319,6 +319,34 @@ void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData } /*********************************************************************** + * AtlWinModuleExtractCreateWndData [atl100.44] + */ +void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *winmod) +{ + _AtlCreateWndData *iter, *prev = NULL; + DWORD thread_id; + + TRACE("(%p)\n", winmod); + + thread_id = GetCurrentThreadId(); + + EnterCriticalSection(&winmod->m_csWindowCreate); + + for(iter = winmod->m_pCreateWndList; iter && iter->m_dwThreadID != thread_id; iter = iter->m_pNext) + prev = iter; + if(iter) { + if(prev) + prev->m_pNext = iter->m_pNext; + else + winmod->m_pCreateWndList = iter->m_pNext; + } + + LeaveCriticalSection(&winmod->m_csWindowCreate); + + return iter ? iter->m_pThis : NULL; +} + +/*********************************************************************** * AtlComModuleGetClassObject [atl100.15] */ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 11cac7d..0c27070 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -27,7 +27,7 @@ 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) -44 stub AtlWinModuleExtractCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) diff --git a/include/atlbase.h b/include/atlbase.h index 95b1f2a..831150d 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -223,6 +223,7 @@ HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppS void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE*); void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); +void* WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE*); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM);

1 0

Jacek Caban : atl100: Added AtlWinModuleExtractCreateWndData tests.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: 5f4f215c2d9dd9465b8a96e00e6e9b10ec84a515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4f215c2d9dd9465b8a96e00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:17:07 2012 +0100 atl100: Added AtlWinModuleExtractCreateWndData tests. --- dlls/atl100/tests/atl.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 43d9bd5..7e6a7e0 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -27,7 +27,9 @@ static void test_winmodule(void) { + _AtlCreateWndData create_data[3]; _ATL_WIN_MODULE winmod; + void *p; HRESULT hres; winmod.cbSize = 0xdeadbeef; @@ -51,6 +53,46 @@ static void test_winmodule(void) winmod.m_rgWindowClassAtoms.m_nSize); ok(winmod.m_rgWindowClassAtoms.m_nAllocSize == 0xdeadbeef, "winmod.m_rgWindowClassAtoms.m_nAllocSize = %d\n", winmod.m_rgWindowClassAtoms.m_nAllocSize); + + InitializeCriticalSection(&winmod.m_csWindowCreate); + + AtlWinModuleAddCreateWndData(&winmod, create_data, (void*)0xdead0001); + ok(winmod.m_pCreateWndList == create_data, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[0].m_pThis == (void*)0xdead0001, "unexpected create_data[0].m_pThis %p\n", create_data[0].m_pThis); + ok(create_data[0].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[0].m_dwThreadID %x\n", + create_data[0].m_dwThreadID); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + + AtlWinModuleAddCreateWndData(&winmod, create_data+1, (void*)0xdead0002); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[1].m_pThis == (void*)0xdead0002, "unexpected create_data[1].m_pThis %p\n", create_data[1].m_pThis); + ok(create_data[1].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[1].m_dwThreadID %x\n", + create_data[1].m_dwThreadID); + ok(create_data[1].m_pNext == create_data, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + AtlWinModuleAddCreateWndData(&winmod, create_data+2, (void*)0xdead0003); + ok(winmod.m_pCreateWndList == create_data+2, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pThis == (void*)0xdead0003, "unexpected create_data[2].m_pThis %p\n", create_data[2].m_pThis); + ok(create_data[2].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[2].m_dwThreadID %x\n", + create_data[2].m_dwThreadID); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0003, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + create_data[1].m_dwThreadID = 0xdeadbeef; + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0001, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + ok(!create_data[1].m_pNext+1, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + p = AtlWinModuleExtractCreateWndData(&winmod); + ok(!p, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } START_TEST(atl)

1 0

Jacek Caban : atl80: Updated spec file.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: f28324a69c1ec3eaa81609d0138060150dad648d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28324a69c1ec3eaa81609d01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 19 14:17:16 2012 +0100 atl80: Updated spec file. --- dlls/atl80/atl80.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 1c940dd..c6e589e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -29,7 +29,7 @@ 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stub AtlWinModuleExtractCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl @@ -49,5 +49,5 @@ 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stub AtlWinModuleInit +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit 66 stub AtlWinModuleTerm

1 0

Hans Leidekker : winhttp: Add a missing goto in winhttp_request_get_Status.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: 10cb483cf164c18a214923937a3724f1dba2effc URL: http://source.winehq.org/git/wine.git/?a=commit;h=10cb483cf164c18a214923937… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 19 12:01:51 2012 +0100 winhttp: Add a missing goto in winhttp_request_get_Status. --- dlls/winhttp/request.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0d44ed1..584f27d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3040,6 +3040,7 @@ static HRESULT WINAPI winhttp_request_get_Status( if (!WinHttpQueryHeaders( request->hrequest, flags, NULL, &status_code, &len, &index )) { err = get_last_error(); + goto done; } *status = status_code;

1 0

Hans Leidekker : wininet: Map socket errors to ERROR_INTERNET_CANNOT_CONNECT in create_netconn_socket .
by Alexandre Julliard 19 Dec '12

19 Dec '12

Module: wine Branch: master Commit: f33f7a5df1a5029adf5da2b3f5ce52665b95fb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33f7a5df1a5029adf5da2b3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 19 12:02:36 2012 +0100 wininet: Map socket errors to ERROR_INTERNET_CANNOT_CONNECT in create_netconn_socket. --- dlls/wininet/netconnection.c | 2 +- dlls/wininet/tests/http.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e7a3274..8d5fc6f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -646,7 +646,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t } } if(result == -1) - return sock_get_error(errno); + return ERROR_INTERNET_CANNOT_CONNECT; #ifdef TCP_NODELAY flag = 1; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c9bd0a4..ba4ec4d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4041,6 +4041,32 @@ static void test_InternetCloseHandle(void) closetest_req, res, GetLastError()); } +static void test_connection_failure(void) +{ + HINTERNET session, connect, request; + DWORD error; + BOOL ret; + + session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(session != NULL, "failed to get session handle\n"); + + connect = InternetConnectA(session, "localhost", 1, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "failed to get connection handle\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, NULL, 0, 0); + ok(request != NULL, "failed to get request handle\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + error = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(error == ERROR_INTERNET_CANNOT_CONNECT, "wrong error %u\n", error); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void init_status_tests(void) { memset(expect, 0, sizeof(expect)); @@ -4117,4 +4143,5 @@ START_TEST(http) InternetReadFile_chunked_test(); HttpSendRequestEx_test(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[3]); + test_connection_failure(); }

1 0