wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Jacek Caban : urlmon.idl: Added AsyncInstallDistributionUnit declaration.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: a19fb6086bb57fc85c69182938e9c72cd9e24824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19fb6086bb57fc85c6918293… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 13:02:43 2012 +0100 urlmon.idl: Added AsyncInstallDistributionUnit declaration. --- include/urlmon.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 85444f9..53e803e 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2096,6 +2096,7 @@ cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST,DWORD d cpp_quote("HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST,DWORD,LPCWSTR,IInternetSecurityManager*);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR,LPWSTR*,PSUACTION,DWORD);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri*,IUri**,PSUACTION,DWORD_PTR);") +cpp_quote("HRESULT WINAPI AsyncInstallDistributionUnit(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPCWSTR,IBindCtx*,LPVOID,DWORD);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

1 0

Christian Costa : d3drm: Move mesh builder data cleaning code into a separate function.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: de690b8dae171ceb893f1a0873fb59a6670be14d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de690b8dae171ceb893f1a087… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 31 09:56:15 2012 +0100 d3drm: Move mesh builder data cleaning code into a separate function. --- dlls/d3drm/meshbuilder.c | 59 +++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c28cefd..9d3e67a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -314,6 +314,25 @@ static inline IDirect3DRMMeshBuilderImpl *impl_from_IDirect3DRMMeshBuilder3(IDir return CONTAINING_RECORD(iface, IDirect3DRMMeshBuilderImpl, IDirect3DRMMeshBuilder3_iface); } +static void clean_mesh_builder_data(IDirect3DRMMeshBuilderImpl *mesh_builder) +{ + HeapFree(GetProcessHeap(), 0, mesh_builder->name); + mesh_builder->name = NULL; + HeapFree(GetProcessHeap(), 0, mesh_builder->pVertices); + mesh_builder->pVertices = NULL; + mesh_builder->nb_vertices = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pNormals); + mesh_builder->pNormals = NULL; + mesh_builder->nb_normals = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pFaceData); + mesh_builder->pFaceData = NULL; + mesh_builder->face_data_size = 0; + mesh_builder->nb_faces = 0; + HeapFree(GetProcessHeap(), 0, mesh_builder->pCoords2d); + mesh_builder->pCoords2d = NULL; + mesh_builder->nb_coords2d = 0; +} + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_QueryInterface(IDirect3DRMMeshBuilder2* iface, REFIID riid, void** ppvObject) @@ -363,15 +382,11 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + clean_mesh_builder_data(This); if (This->material) IDirect3DRMMaterial2_Release(This->material); if (This->texture) IDirect3DRMTexture3_Release(This->texture); - HeapFree(GetProcessHeap(), 0, This->name); - HeapFree(GetProcessHeap(), 0, This->pVertices); - HeapFree(GetProcessHeap(), 0, This->pNormals); - HeapFree(GetProcessHeap(), 0, This->pFaceData); - HeapFree(GetProcessHeap(), 0, This->pCoords2d); HeapFree(GetProcessHeap(), 0, This); } @@ -1114,9 +1129,6 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) TRACE("(%p)->(%p)\n", This, pData); - /* Remove previous name */ - HeapFree(GetProcessHeap(), 0, This->name); - This->name = NULL; hr = IDirectXFileData_GetName(pData, NULL, &size); if (hr != DXFILE_OK) return hr; @@ -1128,11 +1140,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) hr = IDirectXFileData_GetName(pData, This->name, &size); if (hr != DXFILE_OK) - { - HeapFree(GetProcessHeap(), 0, This->name); - This->name = NULL; return hr; - } } TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); @@ -1518,15 +1526,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); - /* First free allocated buffers of previous mesh data */ - HeapFree(GetProcessHeap(), 0, This->pVertices); - This->pVertices = NULL; - HeapFree(GetProcessHeap(), 0, This->pNormals); - This->pNormals = NULL; - HeapFree(GetProcessHeap(), 0, This->pFaceData); - This->pFaceData = NULL; - HeapFree(GetProcessHeap(), 0, This->pCoords2d); - This->pCoords2d = NULL; + clean_mesh_builder_data(This); if (loadflags == D3DRMLOAD_FROMMEMORY) { @@ -1622,22 +1622,7 @@ end: IDirectXFile_Release(pDXFile); if (ret != D3DRM_OK) - { - /* Clean mesh data */ - This->nb_vertices = 0; - This->nb_normals = 0; - This->nb_faces = 0; - This->face_data_size = 0; - This->nb_coords2d = 0; - HeapFree(GetProcessHeap(), 0, This->pVertices); - This->pVertices = NULL; - HeapFree(GetProcessHeap(), 0, This->pNormals); - This->pNormals = NULL; - HeapFree(GetProcessHeap(), 0, This->pFaceData); - This->pFaceData = NULL; - HeapFree(GetProcessHeap(), 0, This->pCoords2d); - This->pCoords2d = NULL; - } + clean_mesh_builder_data(This); return ret; }

1 0

Christian Costa : d3drm: Init vertices before creating group.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 43d3ba36a1c31ffa8f365eaadcccfd727f8a6020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d3ba36a1c31ffa8f365eaad… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 31 09:56:07 2012 +0100 d3drm: Init vertices before creating group. --- dlls/d3drm/meshbuilder.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 87ff35c..c28cefd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2081,6 +2081,18 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil unsigned* out_ptr; DWORD* in_ptr = This->pFaceData; int i, j; + D3DRMVERTEX* vertices; + + vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); + if (!vertices) + { + IDirect3DRMMesh_Release(*mesh); + return E_OUTOFMEMORY; + } + for (i = 0; i < This->nb_vertices; i++) + vertices[i].position = This->pVertices[i]; + hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, This->nb_vertices, vertices); + HeapFree(GetProcessHeap(), 0, vertices); face_data = HeapAlloc(GetProcessHeap(), 0, This->face_data_size * sizeof(DWORD)); if (!face_data) @@ -2121,25 +2133,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, vertex_per_face, face_data, &group); HeapFree(GetProcessHeap(), 0, face_data); - if (SUCCEEDED(hr)) - { - D3DRMVERTEX* vertices; - vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); - if (vertices) - { - for (i = 0; i < This->nb_vertices; i++) - { - vertices[i].position = This->pVertices[i]; - } - hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, This->nb_vertices, vertices); - HeapFree(GetProcessHeap(), 0, vertices); - } - else - { - hr = E_OUTOFMEMORY; - } - } if (SUCCEEDED(hr)) hr = IDirect3DRMMesh_SetGroupColor(*mesh, 0, This->color); if (SUCCEEDED(hr))

1 0

Huw Davies : vbscript: The first day of the week should default to Sunday, not the system default.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 908c2d44e1fdb2c3039e8505bd0269fedb3f0614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908c2d44e1fdb2c3039e8505b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 31 12:06:23 2012 +0000 vbscript: The first day of the week should default to Sunday, not the system default. --- dlls/vbscript/global.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 900242b..420a5a5 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1426,7 +1426,7 @@ static HRESULT Global_FormatDateTime(vbdisp_t *This, VARIANT *arg, unsigned args static HRESULT Global_WeekdayName(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - int weekday, first_day = 0, abbrev = 0; + int weekday, first_day = 1, abbrev = 0; BSTR ret; HRESULT hres;

1 0

Nikolay Sivov : dwrite: Support for Armenian, Hebrew and complete Arabic ranges.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 368bc8aa5080a3bab338872bcea1983879d95cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=368bc8aa5080a3bab338872bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 31 10:44:49 2012 -0400 dwrite: Support for Armenian, Hebrew and complete Arabic ranges. --- dlls/dwrite/analyzer.c | 8 +++++++- dlls/dwrite/tests/analyzer.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 541914b..0a0642a 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -29,10 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, + Script_Armenian = 1, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, Script_Greek = 23, + Script_Hebrew = 29, Script_Latin = 38, Script_Symbol = 77, Script_Unknown = (UINT16)-1 @@ -79,8 +81,12 @@ static const struct script_range script_ranges[] = { /* Cyrillic Supplement range is incomplete cause it's based on Unicode 5.2 that doesn't define some Abkhaz and Azerbaijani letters, we support Unicode 6.0 range here */ { Script_Cyrillic, 0x400, 0x52f }, + /* Armenian: U+0530–U+058F */ + { Script_Armenian, 0x530, 0x58f }, + /* Hebrew: U+0590–U+05FF */ + { Script_Hebrew, 0x590, 0x5ff }, /* Arabic: U+0600–U+06FF */ - { Script_Arabic, 0x600, 0x6ef }, + { Script_Arabic, 0x600, 0x6ff }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index c610357..648759f 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -391,17 +391,19 @@ static IDWriteTextAnalysisSourceVtbl analysissourcevtbl = { static IDWriteTextAnalysisSource analysissource = { &analysissourcevtbl }; struct sa_test { - const WCHAR string[20]; + const WCHAR string[50]; int item_count; struct script_analysis sa[10]; }; enum scriptcode { Script_Arabic = 0, + Script_Armenian = 1, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, Script_Greek = 23, + Script_Hebrew = 29, Script_Latin = 38, Script_Symbol = 77 }; @@ -435,6 +437,14 @@ static struct sa_test sa_tests[] = { { { 0, 7, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { + /* Arabic */ + {0x0627,0x0644,0x0635,0x0651,0x0650,0x062d,0x0629,0x064f,' ',0x062a,0x064e, + 0x0627,0x062c,0x064c,' ',0x0639,0x064e,0x0644,0x0649,' ', + 0x0631,0x064f,0x0624,0x0648,0x0633,0x0650,' ',0x0627,0x0644, + 0x0623,0x0635,0x0650,0x062d,0x0651,0x064e,0x0627,0x0621,0x0650,0x06f0,0x06f5,0}, 1, + { { 0, 40, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { /* Arabic, Latin */ {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}, 1, { { 0, 16, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} @@ -505,6 +515,23 @@ static struct sa_test sa_tests[] = { {0x400,0x40f,0x410,0x44f,0x450,0x45f,0x460,0x481,0x48a,0x4f0,0x4fa,0x4ff,0x500,0x510,0x520,0}, 1, { { 0, 15, { Script_Cyrillic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Armenian */ + {0x531,0x540,0x559,0x55f,0x570,0x589,0x58a,0}, 1, + { { 0, 7, { Script_Armenian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Hebrew */ + {0x5e9,0x5dc,0x5d5,0x5dd,0}, 1, + { { 0, 4, { Script_Hebrew, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Hebrew */ + {'p','a','r','t',' ','o','n','e',' ',0x5d7,0x5dc,0x5e7,' ',0x5e9,0x5ea,0x5d9,0x5d9,0x5dd,' ','p','a','r','t',' ','t','h','r','e','e',0}, 3, + { { 0, 9, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { 9, 10, { Script_Hebrew, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { 19, 10, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Jörg Höhle : ntdll: Do not execute callbacks past DeleteTimer(INVALID_HANDLE_VALUE).
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 602807c2a5afca3feba11b5f4d56f1c38cb48665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602807c2a5afca3feba11b5f4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 6 19:07:44 2012 +0100 ntdll: Do not execute callbacks past DeleteTimer(INVALID_HANDLE_VALUE). --- dlls/ntdll/threadpool.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index bd6e06b..81abac3 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1015,7 +1015,11 @@ NTSTATUS WINAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, return STATUS_INVALID_PARAMETER_1; q = t->q; if (CompletionEvent == INVALID_HANDLE_VALUE) + { status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); + if (status == STATUS_SUCCESS) + status = STATUS_PENDING; + } else if (CompletionEvent) event = CompletionEvent; @@ -1029,7 +1033,10 @@ NTSTATUS WINAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, if (CompletionEvent == INVALID_HANDLE_VALUE && event) { if (status == STATUS_PENDING) + { NtWaitForSingleObject(event, FALSE, NULL); + status = STATUS_SUCCESS; + } NtClose(event); }

1 0

Jörg Höhle : winealsa: Fix capture overrun logging.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: c596ddffab5c41e4c5ab8afed63f1ae40627503d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c596ddffab5c41e4c5ab8afed… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 25 22:53:21 2012 +0100 winealsa: Fix capture overrun logging. --- dlls/winealsa.drv/mmdevdrv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1c8b03a..9275fbc 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2043,9 +2043,13 @@ static void alsa_read_data(ACImpl *This) nread = snd_pcm_readi(This->pcm_handle, This->local_buffer + pos * This->fmt->nBlockAlign, readable); + TRACE("read %ld from %u limit %lu\n", nread, This->held_frames + This->lcl_offs_frames, readable); if(nread < 0){ int ret; + if(nread == -EAGAIN) /* no data yet */ + return; + WARN("read failed, recovering: %ld (%s)\n", nread, snd_strerror(nread)); ret = snd_pcm_recover(This->pcm_handle, nread, 0);

1 0

Michael Stefaniuc : user32: Avoid sizeof on structs with variable length array.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 5f304e7000063f92c1e55c1def40640844179127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f304e7000063f92c1e55c1de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 31 11:34:10 2012 +0100 user32: Avoid sizeof on structs with variable length array. --- dlls/user32/exticon.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 840483c..5682c77 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -216,9 +216,6 @@ static BYTE * ICO_LoadIcon( LPBYTE peimage, LPicoICONDIRENTRY lpiIDE, ULONG *uSi * * Reads .ico file and build phony ICONDIR struct */ -#define HEADER_SIZE (sizeof(CURSORICONDIR) - sizeof (CURSORICONDIRENTRY)) -#define HEADER_SIZE_FILE (sizeof(icoICONDIR) - sizeof (icoICONDIRENTRY)) - static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG *uSize ) { CURSORICONDIR * lpcid; /* icon resource in resource-dir format */ @@ -233,7 +230,7 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG return 0; /* allocate the phony ICONDIR structure */ - *uSize = lpcid->idCount * sizeof(CURSORICONDIRENTRY) + HEADER_SIZE; + *uSize = FIELD_OFFSET(CURSORICONDIR, idEntries[lpcid->idCount]); if( (lpID = HeapAlloc(GetProcessHeap(),0, *uSize) )) { /* copy the header */

1 0

Michael Stefaniuc : usp10: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: b4712d2e165979e8c77697a013d3e9c97eeb66ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4712d2e165979e8c77697a01… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 31 11:32:33 2012 +0100 usp10: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/usp10/opentype.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 138890f..635b822 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -933,7 +933,8 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched Backtrack\n"); - ccsf3_2 = (const GSUB_ChainContextSubstFormat3_2 *)(((LPBYTE)ccsf1)+sizeof(GSUB_ChainContextSubstFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)-1))); + ccsf3_2 = (const GSUB_ChainContextSubstFormat3_2 *)((BYTE *)ccsf1 + + FIELD_OFFSET(GSUB_ChainContextSubstFormat3_1, Coverage[GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)])); indexGlyphs = GET_BE_WORD(ccsf3_2->InputGlyphCount); for (k = 0; k < indexGlyphs; k++) @@ -946,7 +947,8 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched IndexGlyphs\n"); - ccsf3_3 = (const GSUB_ChainContextSubstFormat3_3 *)(((LPBYTE)ccsf3_2)+sizeof(GSUB_ChainContextSubstFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_2->InputGlyphCount)-1))); + ccsf3_3 = (const GSUB_ChainContextSubstFormat3_3 *)((BYTE *)ccsf3_2 + + FIELD_OFFSET(GSUB_ChainContextSubstFormat3_2, Coverage[GET_BE_WORD(ccsf3_2->InputGlyphCount)])); for (k = 0; k < GET_BE_WORD(ccsf3_3->LookaheadGlyphCount); k++) { @@ -958,7 +960,8 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched LookAhead\n"); - ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)(((LPBYTE)ccsf3_3)+sizeof(GSUB_ChainContextSubstFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)-1))); + ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)((BYTE *)ccsf3_3 + + FIELD_OFFSET(GSUB_ChainContextSubstFormat3_3, Coverage[GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)])); if (GET_BE_WORD(ccsf3_4->SubstCount)) { @@ -1421,7 +1424,8 @@ static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lpl continue; TRACE("Matched Backtrack\n"); - ccpf3_2 = (const GPOS_ChainContextPosFormat3_2*)(((LPBYTE)ccpf3)+sizeof(GPOS_ChainContextPosFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccpf3->BacktrackGlyphCount)-1))); + ccpf3_2 = (const GPOS_ChainContextPosFormat3_2*)((BYTE *)ccpf3 + + FIELD_OFFSET(GPOS_ChainContextPosFormat3_1, Coverage[GET_BE_WORD(ccpf3->BacktrackGlyphCount)])); indexGlyphs = GET_BE_WORD(ccpf3_2->InputGlyphCount); for (k = 0; k < indexGlyphs; k++) @@ -1434,7 +1438,8 @@ static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lpl continue; TRACE("Matched IndexGlyphs\n"); - ccpf3_3 = (const GPOS_ChainContextPosFormat3_3*)(((LPBYTE)ccpf3_2)+sizeof(GPOS_ChainContextPosFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccpf3_2->InputGlyphCount)-1))); + ccpf3_3 = (const GPOS_ChainContextPosFormat3_3*)((BYTE *)ccpf3_2 + + FIELD_OFFSET(GPOS_ChainContextPosFormat3_2, Coverage[GET_BE_WORD(ccpf3_2->InputGlyphCount)])); for (k = 0; k < GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); k++) { @@ -1446,7 +1451,8 @@ static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lpl continue; TRACE("Matched LookAhead\n"); - ccpf3_4 = (const GPOS_ChainContextPosFormat3_4*)(((LPBYTE)ccpf3_3)+sizeof(GPOS_ChainContextPosFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccpf3_3->LookaheadGlyphCount)-1))); + ccpf3_4 = (const GPOS_ChainContextPosFormat3_4*)((BYTE *)ccpf3_3 + + FIELD_OFFSET(GPOS_ChainContextPosFormat3_3, Coverage[GET_BE_WORD(ccpf3_3->LookaheadGlyphCount)])); if (GET_BE_WORD(ccpf3_4->PosCount)) {

1 0

Jacek Caban : advpack: Added ExtractFilesW implementation.
by Alexandre Julliard 31 Oct '12

31 Oct '12

Module: wine Branch: master Commit: 57b83719b7921c5af268fdfcff633012bf95c3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b83719b7921c5af268fdfcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 11:28:28 2012 +0100 advpack: Added ExtractFilesW implementation. --- dlls/advpack/advpack_private.h | 23 +++++++++++++++++++++++ dlls/advpack/files.c | 32 ++++++++++++++++++++++++++++++-- dlls/advpack/tests/files.c | 19 +++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index cbbbf48..a1bcfe4 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -27,4 +27,27 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECL HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline char *heap_strdupWtoA(const WCHAR *str) +{ + char *ret = NULL; + + if(str) { + size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc(size); + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + } + + return ret; +} + #endif /* __ADVPACK_PRIVATE_H */ diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index f6056f2..c34f6d5 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -779,11 +779,39 @@ done: HRESULT WINAPI ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir, DWORD Flags, LPCWSTR FileList, LPVOID LReserved, DWORD Reserved) { + char *cab_name = NULL, *expand_dir = NULL, *file_list = NULL; + HRESULT hres = S_OK; - FIXME("(%s, %s, %d, %s, %p, %d) stub!\n", debugstr_w(CabName), debugstr_w(ExpandDir), + TRACE("(%s, %s, %d, %s, %p, %d)\n", debugstr_w(CabName), debugstr_w(ExpandDir), Flags, debugstr_w(FileList), LReserved, Reserved); - return E_FAIL; + if(CabName) { + cab_name = heap_strdupWtoA(CabName); + if(!cab_name) + return E_OUTOFMEMORY; + } + + if(ExpandDir) { + expand_dir = heap_strdupWtoA(ExpandDir); + if(!expand_dir) + hres = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hres) && FileList) { + file_list = heap_strdupWtoA(FileList); + if(!file_list) + hres = E_OUTOFMEMORY; + } + + /* cabinet.dll, which does the real job of extracting files, doesn't have UNICODE API, + so we need W->A conversion at some point anyway. */ + if(SUCCEEDED(hres)) + hres = ExtractFilesA(cab_name, expand_dir, Flags, file_list, LReserved, Reserved); + + heap_free(cab_name); + heap_free(expand_dir); + heap_free(file_list); + return hres; } /*********************************************************************** diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 9bb8cde..4a985be 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -32,6 +32,7 @@ static HMODULE hAdvPack; static HRESULT (WINAPI *pAddDelBackupEntry)(LPCSTR, LPCSTR, LPCSTR, DWORD); static HRESULT (WINAPI *pExtractFiles)(LPCSTR, LPCSTR, DWORD, LPCSTR, LPVOID, DWORD); +static HRESULT (WINAPI *pExtractFilesW)(const WCHAR*,const WCHAR*,DWORD,const WCHAR*,void*,DWORD); static HRESULT (WINAPI *pAdvInstallFile)(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,DWORD,DWORD); static CHAR CURR_DIR[MAX_PATH]; @@ -44,6 +45,7 @@ static void init_function_pointers(void) { pAddDelBackupEntry = (void *)GetProcAddress(hAdvPack, "AddDelBackupEntry"); pExtractFiles = (void *)GetProcAddress(hAdvPack, "ExtractFiles"); + pExtractFilesW = (void *)GetProcAddress(hAdvPack, "ExtractFilesW"); pAdvInstallFile = (void*)GetProcAddress(hAdvPack, "AdvInstallFile"); } } @@ -468,6 +470,23 @@ static void test_ExtractFiles(void) ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); + + if(pExtractFilesW) { + static const WCHAR extract_cabW[] = {'e','x','t','r','a','c','t','.','c','a','b',0}; + static const WCHAR destW[] = {'d','e','s','t',0}; + static const WCHAR file_listW[] = + {'a','.','t','x','t',':','t','e','s','t','d','i','r','\\','c','.','t','x','t',0}; + + hr = pExtractFilesW(extract_cabW, destW, 0, file_listW, NULL, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + }else { + win_skip("ExtractFilesW not available\n"); + } } static void test_AdvInstallFile(void)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012