November 2012 - Wine-commits

Piotr Caban : msvcp90: Free memory allocated by _get_current_locale function.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 0609fccf449fd5ae87674feff5032e75cc69af27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0609fccf449fd5ae87674feff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 10 00:00:08 2012 +0100 msvcp90: Free memory allocated by _get_current_locale function. --- dlls/msvcp90/tests/misc.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 5faa03c..19dcdde 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -50,6 +50,7 @@ typedef struct static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); +static void (__cdecl *p__free_locale)(_locale_t); static void (__cdecl *p_free)(void*); static void (__cdecl *p_char_assign)(void*, const void*); @@ -174,8 +175,9 @@ static BOOL init(void) p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); + p__free_locale = (void*)GetProcAddress(msvcr, "_free_locale"); p_free = (void*)GetProcAddress(msvcr, "free"); - if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p_free) { + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p__free_locale || !p_free) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -389,6 +391,7 @@ static void test_wctype(void) static void test__Getctype(void) { MSVCP__Ctypevec ret; + _locale_t locale; ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); @@ -397,7 +400,9 @@ static void test__Getctype(void) ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); p_free(ret.table); - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + p__free_locale(locale); ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); @@ -409,13 +414,16 @@ static void test__Getctype(void) static void test__Getcoll(void) { ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); + _locale_t locale; union { MSVCP__Collvec collvec; ULONGLONG ull; }ret; - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + p__free_locale(locale); ret.ull = 0; p__Getcoll_arg = (void*)p__Getcoll; p__Getcoll_arg(&ret.collvec); @@ -462,12 +470,15 @@ static void test_virtual_call(void) { BYTE this[256]; basic_string_char bstr; + _locale_t locale; const char *p; char str1[] = "test"; char str2[] = "TEST"; int ret; - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 1; + p__free_locale(locale); call_func2(p_collate_char_ctor_refs, this, 0); ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret);

1 0

Piotr Caban : msvcp90: Fixed a memory leak in virtual destructor tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 96c9b0fb842c0ecf6f4e6d36c7aced3e36c805f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c9b0fb842c0ecf6f4e6d36c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 10 00:00:23 2012 +0100 msvcp90: Fixed a memory leak in virtual destructor tests. --- dlls/msvcp90/tests/misc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 19dcdde..5188fd5 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -96,6 +96,7 @@ static /*basic_ostringstream_char*/void* (__thiscall *p_basic_ostringstream_char /*basic_ostringstream_char*/void*, int, /*MSVCP_bool*/int); static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_char*/void*); static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); +static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -223,6 +224,8 @@ static BOOL init(void) "??1?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@UEAA(a)XZ"); SET(p_basic_ostringstream_char_vbase_dtor, "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -258,6 +261,8 @@ static BOOL init(void) "??1?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@UAE(a)XZ"); SET(p_basic_ostringstream_char_vbase_dtor, "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ"); } init_thiscall_thunk(); @@ -503,8 +508,10 @@ static void test_virtual_base_dtors(void) call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 1); call_func1(p_basic_ostringstream_char_vbase_dtor, this); + /* this test uses vbtable set by earlier test */ call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 0); call_func1(p_basic_ostringstream_char_dtor, this+basic_ostringstream_char_vbtable[1]); + call_func1(p_basic_ios_char_dtor, this+((int**)this)[0][1]); } START_TEST(misc)

1 0

Frédéric Delanoy : French translation for release 1.5.17
by Jeremy Newman 12 Nov '12

12 Nov '12

Module: website Branch: master Commit: 1eef770d1aeffd93f8bc530c782d46ee400b0056 URL: http://source.winehq.org/git/website.git/?a=commit;h=1eef770d1aeffd93f8bc53… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 9 21:09:47 2012 +0100 French translation for release 1.5.17 --- news/fr/2012110901.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012110901.xml b/news/fr/2012110901.xml new file mode 100644 index 0000000..2ea1717 --- /dev/null +++ b/news/fr/2012110901.xml @@ -0,0 +1,16 @@ +<news> +<date>9 novembre 2012</date> +<title>Sortie de Wine 1.5.17</title> +<body> + La version de développement 1.5.17 de Wine est disponible. + <a href="{$root}/announce/1.5.17">Nouveautés</a> de cette version : +<ul> + <li>Anticrénelage sur éléments de pixel des fontes dans le moteur DIB.</li> + <li>Prise en charge de l'installation automatique des contrôles ActiveX.</li> + <li>Substitution automatique vers TLS 1.0 pour les connexions sécurisées.</li> + <li>Ébauche d'un analyseur de texte DirectWrite.</li> + <li>Meilleur traitement des polices contours dans OpenGL.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.17
by Jeremy Newman 12 Nov '12

12 Nov '12

Module: website Branch: master Commit: d97aede18aa7c1228997c36ca1340318b7624203 URL: http://source.winehq.org/git/website.git/?a=commit;h=d97aede18aa7c1228997c3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 10 07:28:36 2012 +0100 Polish translation for release 1.5.17 --- news/pl/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012110901.xml b/news/pl/2012110901.xml new file mode 100644 index 0000000..e10ec77 --- /dev/null +++ b/news/pl/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 9, 2012</date> +<title>Wydano Wine 1.5.17</title> +<body> + Wydanie rozwojowe Wine 1.5.17 jest już dostępne. + <a href="{$root}/announce/1.5.17">Co nowego</a> w tym wydaniu: +<ul> + <li>Międzypikselowe wygładzanie czcionek w silniku DIB.</li> + <li>Wsparcie dla samoczynnej instalacji elementów sterowania ActiveX.</li> + <li>Samoczynny powrót do TLS 1.0 dla zabezpieczonych połączeń.</li> + <li>Początki analizatora tekstu DirectWrite.</li> + <li>Lepsza obsługa zarysów czcionek w OpenGL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.17 freigegeben
by Jeremy Newman 09 Nov '12

09 Nov '12

Module: website Branch: master Commit: 0ae35fc7d6b3891c1b2fc47d5d5f528041890e88 URL: http://source.winehq.org/git/website.git/?a=commit;h=0ae35fc7d6b3891c1b2fc4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 9 20:43:14 2012 +0100 Wine 1.5.17 freigegeben --- news/de/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012110901.xml b/news/de/2012110901.xml new file mode 100644 index 0000000..bc36730 --- /dev/null +++ b/news/de/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. November 2012</date> +<title>Wine 1.5.17 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Subpixel Schrift Antialiasing in der DIB Engine.</li> + <li>Unterstützung für die automatische Installation von ActiveX-Steuerelementen.</li> + <li>Bei sicheren Verbindungen wird automatisch auf TLS 1.0 zurückgeschaltet.</li> + <li>Anfänge des DirectWrite Textanalysators.</li> + <li>Besseres Handling von Schriftkonturen in OpenGL.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.17
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: website Branch: master Commit: ec36f6748726ddbf8c0f8befa19a722dbfe8d185 URL: http://source.winehq.org/git/website.git/?a=commit;h=ec36f6748726ddbf8c0f8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:59:32 2012 +0100 Wine release 1.5.17 --- news/en/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012110901.xml b/news/en/2012110901.xml new file mode 100644 index 0000000..3cf992e --- /dev/null +++ b/news/en/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>November 9, 2012</date> +<title>Wine 1.5.17 Released</title> +<body> + The Wine development release 1.5.17 is now available. + <a href="{$root}/announce/1.5.17">What's new</a> in this release: +<ul> + <li>Sub-pixel font anti-aliasing in the DIB engine.</li> + <li>Support for automatic installation of ActiveX controls.</li> + <li>Automatic fallback to TLS 1.0 for secure connections.</li> + <li>Beginnings of the DirectWrite text analyzer.</li> + <li>Better handling of font outlines in OpenGL.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.17.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 1262f07609e6722a841f511445f145d941848800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1262f07609e6722a841f51144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:46:37 2012 +0100 Release 1.5.17. --- ANNOUNCE | 974 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 452 insertions(+), 542 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1262f07609e6722a841f5…

1 0

Tag wine-1.5.17 : Alexandre Julliard : Release 1.5.17
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: refs/tags/wine-1.5.17 Tag: 71461e3ede8285a1bce94881b6f51dfe077afed1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=71461e3ede8285a1bce94881b6f5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:46:40 2012 +0100 Release 1.5.17

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DVERTEXBUFFER.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: f088901c94f565bfb15a36821a4a8209867fda4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f088901c94f565bfb15a36821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 23:29:13 2012 +0100 ddraw: Avoid LPDIRECT3DVERTEXBUFFER. --- include/d3d.h | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index d47df27..26afbda 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -313,7 +313,8 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface, struct IDirect3DDevice3 **device, IUnknown *outer) PURE; - STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk) PURE; + STDMETHOD(CreateVertexBuffer)(THIS_ D3DVERTEXBUFFERDESC *desc, struct IDirect3DVertexBuffer **buffer, + DWORD flags, IUnknown *outer) PURE; STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE; STDMETHOD(EvictManagedTextures)(THIS) PURE; }; @@ -1172,8 +1173,10 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER lpD3DVertexBuf,LPWORD lpwIndices,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, + DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, + WORD *indices, DWORD index_count, DWORD flags) PURE; STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE; STDMETHOD(GetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 *lplpTexture2) PURE; STDMETHOD(SetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 lpTexture2) PURE; @@ -1459,7 +1462,9 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown) /*** IDirect3DVertexBuffer methods ***/ STDMETHOD(Lock)(THIS_ DWORD dwFlags,LPVOID *lplpData,LPDWORD lpdwSize) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(ProcessVertices)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPDIRECT3DVERTEXBUFFER lpSrcBuffer,DWORD dwSrcIndex,LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE; + STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, + IDirect3DVertexBuffer *src_buffer, DWORD src_idx, + IDirect3DDevice3 *device, DWORD flags) PURE; STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE; };

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DEXECUTEBUFFER.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 261a6c30b6f8b843d2e6f8a61916767ece9cc146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=261a6c30b6f8b843d2e6f8a61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 8 23:29:14 2012 +0100 ddraw: Avoid LPDIRECT3DEXECUTEBUFFER. --- include/d3d.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 26afbda..a139481 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -939,13 +939,16 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE lpD3Dtex1, LPDIRECT3DTEXTURE lpD3DTex2) PURE; - STDMETHOD(CreateExecuteBuffer)(THIS_ LPD3DEXECUTEBUFFERDESC lpDesc, LPDIRECT3DEXECUTEBUFFER *lplpDirect3DExecuteBuffer, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, + IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; - STDMETHOD(Execute)(THIS_ LPDIRECT3DEXECUTEBUFFER lpDirect3DExecuteBuffer, LPDIRECT3DVIEWPORT lpDirect3DViewport, DWORD dwFlags) PURE; + STDMETHOD(Execute)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, + DWORD flags) PURE; STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport) PURE; STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport) PURE; STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport, LPDIRECT3DVIEWPORT *lplpDirect3DViewport, DWORD dwFlags) PURE; - STDMETHOD(Pick)(THIS_ LPDIRECT3DEXECUTEBUFFER lpDirect3DExecuteBuffer, LPDIRECT3DVIEWPORT lpDirect3DViewport, DWORD dwFlags, LPD3DRECT lpRect) PURE; + STDMETHOD(Pick)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, + DWORD flags, D3DRECT *rect) PURE; STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(CreateMatrix)(THIS_ LPD3DMATRIXHANDLE lpD3DMatHandle) PURE;

1 0