September 2013 - Wine-commits

Dmitry Timoshkov : gdiplus/tests: Don't bother to delete a NULL hrgn.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 108873320c4366d35891e8efa44a85bc77c6da57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108873320c4366d35891e8efa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:24:30 2013 +0900 gdiplus/tests: Don't bother to delete a NULL hrgn. --- dlls/gdiplus/tests/region.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index ee6e158..a254bed 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -860,12 +860,10 @@ static void test_gethrgn(void) status = GdipGetRegionHRgn(region, NULL, &hrgn); ok(status == Ok, "status %08x\n", status); ok(hrgn == NULL, "hrgn=%p\n", hrgn); - DeleteObject(hrgn); status = GdipGetRegionHRgn(region, graphics, &hrgn); ok(status == Ok, "status %08x\n", status); ok(hrgn == NULL, "hrgn=%p\n", hrgn); - DeleteObject(hrgn); status = GdipSetEmpty(region); ok(status == Ok, "status %08x\n", status);

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for GdipTransformRegion with an empty region path.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 3870e5b25584a3d48b852bb6cc09a13fc7091916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3870e5b25584a3d48b852bb6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:25:12 2013 +0900 gdiplus/tests: Add a test for GdipTransformRegion with an empty region path. --- dlls/gdiplus/tests/region.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index a254bed..7d20c3c 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -117,6 +117,7 @@ static void test_getregiondata(void) DWORD buf[100]; GpRect rect; GpPath *path; + GpMatrix *matrix; memset(buf, 0xee, sizeof(buf)); @@ -376,6 +377,14 @@ static void test_getregiondata(void) ok((*(buf + 8) & (~ 0x00004000)) == 0x00000000, "expected 00000000 got %08x\n", *(buf + 8) & (~ 0x00004000)); + /* Transform an empty region */ + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + status = GdipTransformRegion(region, matrix); +todo_wine + expect(Ok, status); + GdipDeleteMatrix(matrix); + status = GdipDeleteRegion(region); expect(Ok, status);

1 0

Dmitry Timoshkov : gdiplus: GdipTransformRegion should not fail for an empty path.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: ec9a0d85705941e024c366a2f740a5f9e3d1419f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9a0d85705941e024c366a2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:25:57 2013 +0900 gdiplus: GdipTransformRegion should not fail for an empty path. --- dlls/gdiplus/region.c | 3 +++ dlls/gdiplus/tests/region.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index d797459..7186518 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1310,6 +1310,9 @@ static GpStatus transform_region_element(region_element* element, GpMatrix *matr } /* Fall-through to do the actual conversion. */ case RegionDataPath: + if (!element->elementdata.pathdata.path->pathdata.Count) + return Ok; + stat = GdipTransformMatrixPoints(matrix, element->elementdata.pathdata.path->pathdata.Points, element->elementdata.pathdata.path->pathdata.Count); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 7d20c3c..dd2f76d 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -381,7 +381,6 @@ static void test_getregiondata(void) status = GdipCreateMatrix(&matrix); expect(Ok, status); status = GdipTransformRegion(region, matrix); -todo_wine expect(Ok, status); GdipDeleteMatrix(matrix);

1 0

Joško Nikolić : po: Update Croatian translation.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 436e8686f9694ca7a3d65dd808cbbf450a5016d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436e8686f9694ca7a3d65dd80… Author: Joško Nikolić <josko.nikolic(a)fer.hr> Date: Tue Sep 24 06:06:21 2013 +0000 po: Update Croatian translation. --- po/hr.po | 62 +++++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 21 deletions(-) diff --git a/po/hr.po b/po/hr.po index 64f0e81..a221054 100644 --- a/po/hr.po +++ b/po/hr.po @@ -9736,7 +9736,7 @@ msgstr "" #: cmd.rc:346 msgid "Wine CMD Version %1!S!\n" -msgstr "Wine CMD verzija %1!5!\n" +msgstr "Wine CMD verzija %1!S!\n" #: cmd.rc:347 msgid "More? " @@ -9895,6 +9895,13 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"NET naredba [argumenti]\n" +" -ili-\n" +"NET naredba /HELP\n" +"\n" +"Gdje 'naredba' je jedno od HELP, START, STOP ili USE.\n" #: net.rc:28 msgid "" @@ -9905,6 +9912,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"NET START [servis]\n" +"\n" +"Prikazuje popis servisa koji se izvode ukoliko se 'servis' izostavi. Inače " +"'servis' je ime servisa koji će se pokrenuti.\n" #: net.rc:29 msgid "" @@ -9938,31 +9951,31 @@ msgstr "" #: net.rc:34 msgid "The %1 service is starting.\n" -msgstr "" +msgstr "Servis %1 se pokreće.\n" #: net.rc:35 msgid "The %1 service was started successfully.\n" -msgstr "" +msgstr "Servis %1 je uspješno pokrenut.\n" #: net.rc:36 msgid "The %1 service failed to start.\n" -msgstr "" +msgstr "Servis %1 nije uspješno pokrenut.\n" #: net.rc:37 msgid "The %1 service is stopping.\n" -msgstr "" +msgstr "Servis %1 se zaustavlja.\n" #: net.rc:38 msgid "The %1 service was stopped successfully.\n" -msgstr "" +msgstr "Servis %1 je uspješno zaustavljen.\n" #: net.rc:39 msgid "The %1 service failed to stop.\n" -msgstr "" +msgstr "Servis %1 nije uspješno zaustavljen.\n" #: net.rc:41 msgid "There are no entries in the list.\n" -msgstr "" +msgstr "Nema unosa u listi.\n" #: net.rc:42 msgid "" @@ -9992,15 +10005,15 @@ msgstr "Dogodila se mrežna pogreška" #: net.rc:48 msgid "Connection is being made" -msgstr "" +msgstr "Veza se stvara" #: net.rc:49 msgid "Reconnecting" -msgstr "" +msgstr "Ponovno povezivanje" #: net.rc:40 msgid "The following services are running:\n" -msgstr "" +msgstr "Sljedeći servisi se izvode:\n" #: netstat.rc:27 msgid "Active Connections" @@ -10008,7 +10021,7 @@ msgstr "Aktivne veze" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:29 msgid "Local Address" @@ -10902,20 +10915,26 @@ msgid "" "REG [ ADD | DELETE | QUERY ]\n" "REG command /?\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"REG [ ADD | DELETE | QUERY ]\n" +"REG naredba /?\n" #: reg.rc:28 msgid "" "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" "f]\n" msgstr "" +"REG ADD ime_ključa [/v ime_vrijednosti | /ve] [/t vrsta] [/s separator] [/d " +"podaci] [/f]\n" #: reg.rc:29 msgid "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" -msgstr "" +msgstr "REG DELETE ime_ključa [/v ime_vrijednosti | /ve | /va] [/f]\n" #: reg.rc:30 msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" -msgstr "" +msgstr "REG QUERY ime_ključa [/v ime_vrijednosti | /ve] [/s]\n" #: reg.rc:31 msgid "The operation completed successfully\n" @@ -10938,6 +10957,7 @@ msgstr "" msgid "" "Error: The system was unable to find the specified registry key or value\n" msgstr "" +"Greška: Sustav nije mogao pronaći navedeni ključ ili vrijednost u registru.\n" #: regedit.rc:31 msgid "&Registry" @@ -11021,11 +11041,11 @@ msgstr "" #: regedit.rc:226 msgid "Find:" -msgstr "" +msgstr "Pronađi:" #: regedit.rc:228 msgid "Find in:" -msgstr "" +msgstr "Pronađi u:" #: regedit.rc:229 msgid "Keys" @@ -11033,11 +11053,11 @@ msgstr "Ključevi" #: regedit.rc:230 msgid "Value names" -msgstr "" +msgstr "Imena vrijednosti" #: regedit.rc:231 msgid "Value content" -msgstr "" +msgstr "Sadržaj vrijednosti" #: regedit.rc:232 msgid "Whole string only" @@ -11061,11 +11081,11 @@ msgstr "&Izmjeni" #: regedit.rc:264 regedit.rc:277 regedit.rc:293 regedit.rc:306 msgid "Value name:" -msgstr "" +msgstr "Ime vrijednosti:" #: regedit.rc:266 regedit.rc:279 regedit.rc:295 regedit.rc:308 msgid "Value data:" -msgstr "" +msgstr "Podaci vrijednosti:" #: regedit.rc:274 msgid "Edit DWORD" @@ -12994,7 +13014,7 @@ msgid "" msgstr "" "Uzrok ovome može biti problem u programu ili nedostatak u Wine-u. Provjerite " "<a href=\"http://appdb.winehq.org\">bazu aplikacija</a>za savjete o " -"pokretanjuovog programa." +"pokretanju ovog programa." #: winedbg.rc:58 msgid "Show &Details"

1 0

Henri Verbeet : wined3d: Add fallback depth format info for when ARB_depth_texture is not available .
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 8eb73cd0e9aaa1d2d4bd922d03b6ee7a51e865ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb73cd0e9aaa1d2d4bd922d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:44 2013 +0200 wined3d: Add fallback depth format info for when ARB_depth_texture is not available. These use the generic GL_DEPTH_COMPONENT internal format, and can't be used for texturing. --- dlls/wined3d/utils.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e13e094..920a2fc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -884,10 +884,18 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, /* Depth stencil formats */ + {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, + {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, @@ -919,6 +927,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, NULL}, + {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -936,6 +948,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_FRAMEBUFFER_OBJECT, convert_s4x4_uint_d24_unorm}, + {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, + GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_DEPTH, + WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING

1 0

Henri Verbeet : wined3d: Get rid of the broken render target check for surface_blt_special().
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: ea4c3d5d5d3df37391a349542ce82b5a4f56d470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4c3d5d5d3df37391a349542… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:45 2013 +0200 wined3d: Get rid of the broken render target check for surface_blt_special(). This used to work out in practice because swapchain surfaces were always considered render targets, but that's no longer true. We can just remove the check, because surface_blt_special() already contains a proper check itself anyway. --- dlls/wined3d/surface.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c61f589..9d7accd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6777,15 +6777,9 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC } fallback: - /* Special cases for render targets. */ - if ((dst_surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - || (src_surface && (src_surface->resource.usage & WINED3DUSAGE_RENDERTARGET))) - { - if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, - src_surface, &src_rect, flags, fx, filter))) - return WINED3D_OK; - } + if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter))) + return WINED3D_OK; cpu:

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXLineImpl typedef.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: ffc66f471c903d4c9dc99996b1949f180baf77cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc66f471c903d4c9dc99996b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:47 2013 +0200 d3dx9: Get rid of the ID3DXLineImpl typedef. --- dlls/d3dx9_36/line.c | 289 ++++++++++++++++++++++---------------------------- 1 files changed, 126 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffc66f471c903d4c9dc99…

1 0

Henri Verbeet : wined3d: Get rid of clearing the texture bindings in state_init_default().
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 9516ce33d8e098dc446344bbef1aa1d7871a04d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9516ce33d8e098dc446344bbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:46 2013 +0200 wined3d: Get rid of clearing the texture bindings in state_init_default(). This is arbitrary, we don't do it for any of the other resource bindings either, and the wined3d_state structure is assumed to be zero-initialized. --- dlls/wined3d/stateblock.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c593a63..04bedf1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1378,11 +1378,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi /* TODO: Vertex offset in the presampled displacement map. */ state->sampler_states[i][WINED3D_SAMP_DMAP_OFFSET] = 0; } - - for (i = 0; i < gl_info->limits.textures; ++i) - { - state->textures[i] = NULL; - } } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXMeshImpl typedef.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 778b644fc6e8218e40ef38a5db87e7d8232f015d URL: http://source.winehq.org/git/wine.git/?a=commit;h=778b644fc6e8218e40ef38a5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:48 2013 +0200 d3dx9: Get rid of the ID3DXMeshImpl typedef. --- dlls/d3dx9_36/mesh.c | 361 ++++++++++++++++++++++++++------------------------ 1 files changed, 185 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=778b644fc6e8218e40ef3…

1 0

Nikolay Sivov : oleaut32: Support typelib redirection in QueryPathOfRegTypeLib().
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 4be301301467fee6cea351d8632531ef12282546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be301301467fee6cea351d86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 24 12:25:40 2013 +0400 oleaut32: Support typelib redirection in QueryPathOfRegTypeLib(). --- dlls/oleaut32/tests/typelib.c | 22 +++++++++--------- dlls/oleaut32/typelib.c | 49 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f560dd8..2966e9a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4702,19 +4702,24 @@ static void test_LoadRegTypeLib(void) path = NULL; hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &path); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(path); path = NULL; hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_en, &path); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(path); path = NULL; hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_ru, &path); -todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(path); + + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 8, LOCALE_NEUTRAL, &path); + ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr); + + path = NULL; + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 7, LOCALE_NEUTRAL, &path); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(path); @@ -4729,49 +4734,44 @@ todo_wine if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_register_test, 2, 0, LOCALE_NEUTRAL, &tl); +todo_wine ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); /* manifest version is 2.7, actual is 2.5 */ hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 1, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_en, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_ru, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 7, LOCALE_NEUTRAL, &tl); +todo_wine ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 5, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) -{ hr = ITypeLib_GetLibAttr(tl, &attr); ok(hr == S_OK, "got 0x%08x\n", hr); ok(attr->lcid == 0, "got %x\n", attr->lcid); ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); +todo_wine ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, attr); ITypeLib_Release(tl); -} hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2877f1a..616445a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -286,10 +286,23 @@ static WCHAR *get_lcid_subkey( LCID lcid, SYSKIND syskind, WCHAR *buffer ) static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib); +struct tlibredirect_data +{ + ULONG size; + DWORD res; + ULONG name_len; + ULONG name_offset; + LANGID langid; + WORD flags; + ULONG help_len; + ULONG help_offset; + WORD major_version; + WORD minor_version; +}; /* Get the path to a registered type library. Helper for QueryPathOfRegTypeLib. */ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, - SYSKIND syskind, LCID lcid, LPBSTR path ) + SYSKIND syskind, LCID lcid, BSTR *path, BOOL redir ) { HRESULT hr = TYPE_E_LIBNOTREGISTERED; LCID myLCID = lcid; @@ -300,6 +313,30 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); + if (redir) + { + ACTCTX_SECTION_KEYED_DATA data; + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid( 0, NULL, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, guid, &data )) + { + struct tlibredirect_data *tlib = (struct tlibredirect_data*)data.lpData; + WCHAR *nameW; + DWORD len; + + if (tlib->major_version != wMaj || tlib->minor_version < wMin) + return TYPE_E_LIBNOTREGISTERED; + + nameW = (WCHAR*)((BYTE*)data.lpSectionBase + tlib->name_offset); + len = SearchPathW( NULL, nameW, NULL, sizeof(Path)/sizeof(WCHAR), Path, NULL ); + if (!len) return TYPE_E_LIBNOTREGISTERED; + + TRACE_(typelib)("got path from context %s\n", debugstr_w(Path)); + *path = SysAllocString( Path ); + return S_OK; + } + } + if (!find_typelib_key( guid, &wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; get_typelib_key( guid, wMaj, wMin, buffer ); @@ -371,12 +408,14 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, */ HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID lcid, LPBSTR path ) { + BOOL redir = TRUE; #ifdef _WIN64 - HRESULT hres = query_typelib_path( guid, wMaj, wMin, SYS_WIN64, lcid, path ); + HRESULT hres = query_typelib_path( guid, wMaj, wMin, SYS_WIN64, lcid, path, TRUE ); if(SUCCEEDED(hres)) return hres; + redir = FALSE; #endif - return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path ); + return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path, redir ); } /****************************************************************************** @@ -808,7 +847,7 @@ HRESULT WINAPI UnRegisterTypeLib( } /* get the path to the typelib on disk */ - if (query_typelib_path(libid, wVerMajor, wVerMinor, syskind, lcid, &tlibPath) != S_OK) { + if (query_typelib_path(libid, wVerMajor, wVerMinor, syskind, lcid, &tlibPath, FALSE) != S_OK) { result = E_INVALIDARG; goto end; } @@ -7644,7 +7683,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ref_type->pImpTLInfo->wVersionMajor, ref_type->pImpTLInfo->wVersionMinor, This->pTypeLib->syskind, - ref_type->pImpTLInfo->lcid, &libnam); + ref_type->pImpTLInfo->lcid, &libnam, TRUE); if(FAILED(result)) libnam = SysAllocString(ref_type->pImpTLInfo->name);

1 0