November 2012 - Wine-Commits

Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE3.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: a0ee8b20bc6f3e7c9fec22923c6fbee2a294d11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ee8b20bc6f3e7c9fec22923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 21:24:21 2012 +0100 ddraw: Avoid LPDIRECT3DDEVICE3. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 9cab6f7..5a8f576 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -534,7 +534,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial3,IUnknown) /*** IDirect3DMaterial3 methods ***/ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE3 lpDirect3DDevice3, LPD3DMATERIALHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice3 *device, D3DMATERIALHANDLE *handle) PURE; }; #undef INTERFACE @@ -1472,7 +1472,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown) 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; + STDMETHOD(Optimize)(THIS_ IDirect3DDevice3 *device, DWORD flags) PURE; }; #undef INTERFACE

1 0

Alexandre Julliard : user32: Add system parameter descriptors for user preference parameters.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 95d782779c92dfb3d07fcaf82deb1048b9ff2f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d782779c92dfb3d07fcaf82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 12:19:19 2012 +0100 user32: Add system parameter descriptors for user preference parameters. --- dlls/user32/sysparams.c | 270 ++++++++++++++++++++++++++++------------------- 1 files changed, 161 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95d782779c92dfb3d07fc…

1 0

Alexandre Julliard : user32: Properly set last error in MapWindowPoints.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 5dea6543170fd12928cf2196b55fec9c2fe82c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dea6543170fd12928cf2196b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 16:26:13 2012 +0100 user32: Properly set last error in MapWindowPoints. --- dlls/user32/winpos.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index eda5b78..c620df9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -422,11 +422,11 @@ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags) * Calculate the offset between the origin of the two windows. Used * to implement MapWindowPoints. */ -static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) +static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POINT *ret_offset ) { WND * wndPtr; POINT offset; - BOOL mirror_from, mirror_to; + BOOL mirror_from, mirror_to, ret; HWND hwnd; offset.x = offset.y = 0; @@ -435,7 +435,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) /* Translate source window origin to screen coords */ if (hwndFrom) { - if (!(wndPtr = WIN_GetPtr( hwndFrom ))) return offset; + if (!(wndPtr = WIN_GetPtr( hwndFrom ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } if (wndPtr == WND_OTHER_PROCESS) goto other_process; if (wndPtr != WND_DESKTOP) { @@ -466,7 +470,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) /* Translate origin to destination window coords */ if (hwndTo) { - if (!(wndPtr = WIN_GetPtr( hwndTo ))) return offset; + if (!(wndPtr = WIN_GetPtr( hwndTo ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } if (wndPtr == WND_OTHER_PROCESS) goto other_process; if (wndPtr != WND_DESKTOP) { @@ -496,35 +504,37 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) *mirrored = mirror_from ^ mirror_to; if (mirror_from) offset.x = -offset.x; - return offset; + *ret_offset = offset; + return TRUE; other_process: /* one of the parents may belong to another process, do it the hard way */ - offset.x = offset.y = 0; SERVER_START_REQ( get_windows_offset ) { req->from = wine_server_user_handle( hwndFrom ); req->to = wine_server_user_handle( hwndTo ); - if (!wine_server_call( req )) + if ((ret = !wine_server_call_err( req ))) { - offset.x = reply->x; - offset.y = reply->y; + ret_offset->x = reply->x; + ret_offset->y = reply->y; *mirrored = reply->mirror; } } SERVER_END_REQ; - return offset; + return ret; } /* map coordinates of a window region */ void map_window_region( HWND from, HWND to, HRGN hrgn ) { BOOL mirrored; - POINT offset = WINPOS_GetWinOffset( from, to, &mirrored ); + POINT offset; UINT i, size; RGNDATA *data; HRGN new_rgn; RECT *rect; + if (!WINPOS_GetWinOffset( from, to, &mirrored, &offset )) return; + if (!mirrored) { OffsetRgn( hrgn, offset.x, offset.y ); @@ -557,9 +567,11 @@ void map_window_region( HWND from, HWND to, HRGN hrgn ) INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count ) { BOOL mirrored; - POINT offset = WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored ); + POINT offset; UINT i; + if (!WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored, &offset )) return 0; + for (i = 0; i < count; i++) { lppt[i].x += offset.x;

1 0

Christian Costa : user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 5267f8b7d99aed32fe15ee02b0bfdcf7b47edc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5267f8b7d99aed32fe15ee02b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 13 21:16:44 2012 +0100 user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient. Based on a patch by Rico Schüller. --- dlls/user32/tests/win.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 223 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5267f8b7d99aed32fe15e…

1 0

Piotr Caban : msvcp60: Fixed basic_istream::getline(basic_string) implementation.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 43e8e008b2f41355051b71b43f61959ba784505b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e8e008b2f41355051b71b43… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:41 2012 +0100 msvcp60: Fixed basic_istream::getline(basic_string) implementation. --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp60/string.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 08a3848..02e903d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7617,9 +7617,9 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); + basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); - basic_string_char_clear(str); c = basic_streambuf_char_sgetc(strbuf); for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) @@ -8909,9 +8909,9 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); + basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); - basic_string_wchar_clear(str); c = basic_streambuf_wchar_sgetc(strbuf); for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 803cd33..d2e1c81 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -153,7 +153,8 @@ void __thiscall basic_string_char__Eos(basic_string_char *this, MSVCP_size_t len void basic_string_char_clear(basic_string_char *this) { - basic_string_char__Eos(this, 0); + if(this->ptr) + basic_string_char__Eos(this, 0); } /* ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z */ @@ -1865,7 +1866,8 @@ void __thiscall basic_string_wchar__Eos(basic_string_wchar *this, MSVCP_size_t l void basic_string_wchar_clear(basic_string_wchar *this) { - basic_string_wchar__Eos(this, 0); + if(this->ptr) + basic_string_wchar__Eos(this, 0); } /* ?_Tidy@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEX_N(a)Z */

1 0

Piotr Caban : msvcp60: Fixed basic_istream::ipfx implementation.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 9796cf388c967fdf8c21a264cc186636177951be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9796cf388c967fdf8c21a264c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:19 2012 +0100 msvcp60: Fixed basic_istream::ipfx implementation. --- dlls/msvcp60/ios.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index d243b1d..99493c4 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -6756,12 +6756,7 @@ static MSVCP_bool basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_bool for(ch = basic_streambuf_char_sgetc(strbuf); ; ch = basic_streambuf_char_snextc(strbuf)) { - if(ch == EOF) { - basic_ios_char_setstate(base, IOSTATE_eofbit); - break; - } - - if(!ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) + if(ch==EOF || !ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) break; } } @@ -7985,12 +7980,7 @@ static MSVCP_bool basic_istream_wchar__Ipfx(basic_istream_wchar *this, MSVCP_boo for(ch = basic_streambuf_wchar_sgetc(strbuf); ; ch = basic_streambuf_wchar_snextc(strbuf)) { - if(ch == WEOF) { - basic_ios_wchar_setstate(base, IOSTATE_eofbit); - break; - } - - if(!ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch)) + if(ch==WEOF || !ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch)) break; } }

1 0

Piotr Caban : msvcp60: Fixed basic_string::c_str implementation.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 1c33835a53bc00d315f63721fa684d31b805fbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c33835a53bc00d315f63721f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:54 2012 +0100 msvcp60: Fixed basic_string::c_str implementation. --- dlls/msvcp60/locale.c | 12 ++++++------ dlls/msvcp60/string.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index bbeb5a5..f350014 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -3970,7 +3970,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; if(sep) basic_string_char_ctor(&groups_found); @@ -4124,7 +4124,7 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_wchar_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -5034,7 +5034,7 @@ static int num_get_char__Getffld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; if(sep) basic_string_char_ctor(&groups_found); @@ -5186,7 +5186,7 @@ static int num_get_char__Getifld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -5949,7 +5949,7 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; @@ -6032,7 +6032,7 @@ static ostreambuf_iterator_char* num_put_char__Iput(const num_put *this, ostream /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index ed4391c..69917dc 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -1666,7 +1666,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_char_c_str, 4) const char* __thiscall basic_string_char_c_str(const basic_string_char *this) { TRACE("%p\n", this); - return this->ptr; + return this->ptr ? this->ptr : basic_string_char__Nullstr(); } /* ?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ */ @@ -3376,7 +3376,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_wchar_c_str, 4) const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar *this) { TRACE("%p\n", this); - return this->ptr; + return this->ptr ? this->ptr : basic_string_wchar__Nullstr(); } /* ?size@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIXZ */

1 0

Alexandre Julliard : user32: Add some error checking in ScreenToClient and ClientToScreen.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 7fc61f6fea27d207706f896dbf47285516ebe760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc61f6fea27d207706f896db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 16:29:39 2012 +0100 user32: Add some error checking in ScreenToClient and ClientToScreen. --- dlls/user32/winpos.c | 62 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c620df9..0ce3ddd 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -235,26 +235,6 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) } -/******************************************************************* - * ClientToScreen (USER32.@) - */ -BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) -{ - MapWindowPoints( hwnd, 0, lppnt, 1 ); - return TRUE; -} - - -/******************************************************************* - * ScreenToClient (USER32.@) - */ -BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) -{ - MapWindowPoints( 0, hwnd, lppnt, 1 ); - return TRUE; -} - - /*********************************************************************** * list_children_from_point * @@ -588,6 +568,48 @@ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count } +/******************************************************************* + * ClientToScreen (USER32.@) + */ +BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + if (!WINPOS_GetWinOffset( hwnd, 0, &mirrored, &offset )) return FALSE; + lppnt->x += offset.x; + lppnt->y += offset.y; + if (mirrored) lppnt->x = -lppnt->x; + return TRUE; +} + + +/******************************************************************* + * ScreenToClient (USER32.@) + */ +BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + if (!WINPOS_GetWinOffset( 0, hwnd, &mirrored, &offset )) return FALSE; + lppnt->x += offset.x; + lppnt->y += offset.y; + if (mirrored) lppnt->x = -lppnt->x; + return TRUE; +} + + /*********************************************************************** * IsIconic (USER32.@) */

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSGetShader().
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 25c449247f40f2e637187a6066eadf17610fd015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c449247f40f2e637187a606… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 21:24:23 2012 +0100 d3d10core: Implement d3d10_device_GSGetShader(). --- dlls/d3d10core/device.c | 16 +++++++++++++++- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0f30a13..84fff72 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -546,7 +546,21 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device *iface, ID3D10GeometryShader **shader) { - FIXME("iface %p, shader %p stub!\n", iface, shader); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct d3d10_geometry_shader *shader_impl; + struct wined3d_shader *wined3d_shader; + + TRACE("iface %p, shader %p.\n", iface, shader); + + if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) + { + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + *shader = &shader_impl->ID3D10GeometryShader_iface; + ID3D10GeometryShader_AddRef(*shader); } static void STDMETHODCALLTYPE d3d10_device_IAGetPrimitiveTopology(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 979a248..2242cc3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3012,6 +3012,13 @@ void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, str device_invalidate_state(device, STATE_GEOMETRY_SHADER); } +struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->stateBlock->state.geometry_shader; +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3bfa239..f8364e1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -64,6 +64,7 @@ @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) +@ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_index_buffer(ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fff8bd9..7169a25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2124,6 +2124,7 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); +struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light);

1 0

Piotr Caban : msvcp60: Fixed basic_filebuf<char> implementation.
by Alexandre Julliard Nov. 14, 2012

Nov. 14, 2012

Module: wine Branch: master Commit: 043fcc92be98c95d299503ea04accf4786266a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043fcc92be98c95d299503ea0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:25 2012 +0100 msvcp60: Fixed basic_filebuf<char> implementation. --- dlls/msvcp60/ios.c | 225 ++++++++++++++++++--------------------------- dlls/msvcp60/locale.c | 4 - dlls/msvcp60/msvcp.h | 7 ++ dlls/msvcp60/msvcp60.spec | 8 +- 4 files changed, 99 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=043fcc92be98c95d29950…

1 0