wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Maarten Lankhorst : ntdll: Make all exported wine functions CDECL.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 768160e944af4a67a0a29494b7bab4fab65ad3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768160e944af4a67a0a29494b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 16:37:46 2008 +0100 ntdll: Make all exported wine functions CDECL. --- dlls/advapi32/service.c | 2 +- dlls/kernel32/kernel_main.c | 2 +- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/process.c | 2 +- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/loader.c | 2 +- dlls/ntdll/path.c | 2 +- dlls/ntdll/process.c | 2 +- dlls/ntdll/rtlstr.c | 4 ++-- dlls/ntdll/server.c | 8 ++++---- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_sparc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- include/wine/server.h | 8 ++++---- include/winternl.h | 6 +++--- programs/rpcss/rpcss_main.c | 2 +- programs/services/rpc.c | 2 +- programs/wineboot/wineboot.c | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=768160e944af4a67a0a29…

1 0

Maarten Lankhorst : winex11.drv/explorer: Add CDECL to exported functions.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: d6bc9fc9f3ed14b3b023fc5c9dff72f8baf27fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bc9fc9f3ed14b3b023fc5c9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 14:59:00 2008 +0100 winex11.drv/explorer: Add CDECL to exported functions. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/systray.c | 2 +- programs/explorer/desktop.c | 2 +- programs/explorer/systray.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c8b202c..d6b2888 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -128,7 +128,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) * * Create the X11 desktop window for the desktop mode. */ -Window X11DRV_create_desktop( UINT width, UINT height ) +Window CDECL X11DRV_create_desktop( UINT width, UINT height ) { XSetWindowAttributes win_attr; Window win; diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 17d3b07..ddeb223 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -415,7 +415,7 @@ static BOOL delete_icon( struct tray_icon *icon ) * * Driver-side implementation of Shell_NotifyIcon. */ -int wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) +int CDECL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) { BOOL ret = FALSE; struct tray_icon *icon; diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index a74c621..480d245 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -105,7 +105,7 @@ static unsigned long create_desktop( const WCHAR *name, unsigned int width, unsi HMODULE x11drv = GetModuleHandleA( "winex11.drv" ); HDESK desktop; unsigned long xwin = 0; - unsigned long (*create_desktop_func)(unsigned int, unsigned int); + unsigned long (CDECL *create_desktop_func)(unsigned int, unsigned int); desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); if (!desktop) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 37f3551..9be95bb 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); #define IS_OPTION_FALSE(ch) \ ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') -static int (*wine_notify_icon)(DWORD,NOTIFYICONDATAW *); +static int (CDECL *wine_notify_icon)(DWORD,NOTIFYICONDATAW *); /* an individual systray icon, unpacked from the NOTIFYICONDATA and always in unicode */ struct icon

1 0

Maarten Lankhorst : winex11.drv: Make XIM functions hidden.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 602b9b08332d19b9da6a7fbc3508bbb810162bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602b9b08332d19b9da6a7fbc3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 15:02:52 2008 +0100 winex11.drv: Make XIM functions hidden. --- dlls/winex11.drv/winex11.drv.spec | 3 --- dlls/winex11.drv/x11drv.h | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 7cafaac..585d130 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -134,9 +134,6 @@ # System tray @ cdecl wine_notify_icon(long ptr) -# XIM -@ cdecl ForceXIMReset(long) X11DRV_ForceXIMReset - # OpenGL @ cdecl wglCopyContext(long long long) X11DRV_wglCopyContext @ cdecl wglCreateContext(ptr) X11DRV_wglCreateContext diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e5a0fe0..8053014 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -773,11 +773,11 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name, extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem); /* XIM support */ -extern BOOL X11DRV_InitXIM( const char *input_style ); -extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data); -extern void X11DRV_SetupXIM(void); -extern void X11DRV_XIMLookupChars( const char *str, DWORD count ); -extern void X11DRV_ForceXIMReset(HWND hwnd); +extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; +extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; +extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; +extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; +extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; /* FIXME: private functions imported from user32 */ extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode );

1 0

Maarten Lankhorst : wintab32/winex11.drv: Add CDECL to imported functions.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 569de388fa1297841b08648db660dd80d1d79b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=569de388fa1297841b08648db… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 14:30:37 2008 +0100 wintab32/winex11.drv: Add CDECL to imported functions. --- dlls/winex11.drv/wintab.c | 16 ++++++++-------- dlls/wintab32/wintab32.c | 8 ++++---- dlls/wintab32/wintab_internal.h | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index c997c7c..30f3e85 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -484,7 +484,7 @@ static void disable_system_cursors(void) /*********************************************************************** * X11DRV_LoadTabletInfo (X11DRV.@) */ -void X11DRV_LoadTabletInfo(HWND hwnddefault) +void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; @@ -959,7 +959,7 @@ static void proximity_event( HWND hwnd, XEvent *event ) /*********************************************************************** * X11DRV_AttachEventQueueToTablet (X11DRV.@) */ -int X11DRV_AttachEventQueueToTablet(HWND hOwner) +int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) { struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; @@ -1041,7 +1041,7 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) /*********************************************************************** * X11DRV_GetCurrentPacket (X11DRV.@) */ -int X11DRV_GetCurrentPacket(LPWTPACKET packet) +int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet) { *packet = gMsgPacket; return 1; @@ -1062,7 +1062,7 @@ static inline int CopyTabletData(LPVOID target, LPCVOID src, INT size) /*********************************************************************** * X11DRV_WTInfoW (X11DRV.@) */ -UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) +UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) { /* * It is valid to call WTInfoA with lpOutput == NULL, as per standard. @@ -1488,7 +1488,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) /*********************************************************************** * AttachEventQueueToTablet (X11DRV.@) */ -int X11DRV_AttachEventQueueToTablet(HWND hOwner) +int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) { return 0; } @@ -1496,7 +1496,7 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) /*********************************************************************** * GetCurrentPacket (X11DRV.@) */ -int X11DRV_GetCurrentPacket(LPWTPACKET packet) +int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet) { return 0; } @@ -1504,14 +1504,14 @@ int X11DRV_GetCurrentPacket(LPWTPACKET packet) /*********************************************************************** * LoadTabletInfo (X11DRV.@) */ -void X11DRV_LoadTabletInfo(HWND hwnddefault) +void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { } /*********************************************************************** * WTInfoW (X11DRV.@) */ -UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) +UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) { return 0; } diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 5f2afb1..b52b429 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -36,10 +36,10 @@ static const WCHAR WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0}; CRITICAL_SECTION csTablet; -int (*pLoadTabletInfo)(HWND hwnddefault) = NULL; -int (*pGetCurrentPacket)(LPWTPACKET packet) = NULL; -int (*pAttachEventQueueToTablet)(HWND hOwner) = NULL; -UINT (*pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) = NULL; +int (CDECL *pLoadTabletInfo)(HWND hwnddefault) = NULL; +int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) = NULL; +int (CDECL *pAttachEventQueueToTablet)(HWND hOwner) = NULL; +UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) = NULL; static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index 4fa4bfd..b0a2e8f 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -151,10 +151,10 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd); /* X11drv functions */ -extern int (*pLoadTabletInfo)(HWND hwnddefault); -extern int (*pGetCurrentPacket)(LPWTPACKET packet); -extern int (*pAttachEventQueueToTablet)(HWND hOwner); -extern UINT (*pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput); +extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault); +extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet); +extern int (CDECL *pAttachEventQueueToTablet)(HWND hOwner); +extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput); extern HWND hwndDefault; extern CRITICAL_SECTION csTablet;

1 0

Alexandre Julliard : msvcrt: Add __cdecl to all function prototypes.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: bb33b0a21dec69507447bae713063bb313c5ce85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb33b0a21dec69507447bae71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 14:45:18 2008 +0100 msvcrt: Add __cdecl to all function prototypes. --- dlls/crtdll/crtdll_main.c | 2 - dlls/msvcrt/lock.c | 3 +- dlls/msvcrt/mtdll.h | 4 +- include/msvcrt/conio.h | 34 +++--- include/msvcrt/crtdbg.h | 16 +- include/msvcrt/ctype.h | 74 ++++++------ include/msvcrt/direct.h | 26 ++-- include/msvcrt/dos.h | 2 +- include/msvcrt/eh.h | 24 ++-- include/msvcrt/errno.h | 2 +- include/msvcrt/float.h | 16 +- include/msvcrt/io.h | 100 +++++++------- include/msvcrt/locale.h | 6 +- include/msvcrt/malloc.h | 40 +++--- include/msvcrt/math.h | 62 +++++----- include/msvcrt/mbctype.h | 32 +++--- include/msvcrt/mbstring.h | 149 +++++++++++----------- include/msvcrt/memory.h | 12 +- include/msvcrt/process.h | 106 ++++++++-------- include/msvcrt/search.h | 12 +- include/msvcrt/setjmp.h | 4 +- include/msvcrt/signal.h | 6 +- include/msvcrt/stddef.h | 6 +- include/msvcrt/stdio.h | 200 ++++++++++++++-------------- include/msvcrt/stdlib.h | 202 ++++++++++++++--------------- include/msvcrt/string.h | 120 +++++++++--------- include/msvcrt/sys/stat.h | 20 ++-- include/msvcrt/sys/timeb.h | 2 +- include/msvcrt/sys/utime.h | 7 +- include/msvcrt/time.h | 46 ++++---- include/msvcrt/wchar.h | 308 ++++++++++++++++++++++---------------------- include/msvcrt/wctype.h | 34 +++--- 32 files changed, 832 insertions(+), 845 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb33b0a21dec69507447b…

1 0

Henri Verbeet : winex11.drv: Fix color conversion for 16 bpp cursors.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 6de9cfaf7fd5ef70caa44712119d613e8b4da568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de9cfaf7fd5ef70caa447121… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 16 16:37:37 2008 +0100 winex11.drv: Fix color conversion for 16 bpp cursors. --- dlls/winex11.drv/mouse.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index bcae0c6..89587d8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -408,6 +408,24 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, */ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) { + static const unsigned char convert_5to8[] = + { + 0x00, 0x08, 0x10, 0x19, 0x21, 0x29, 0x31, 0x3a, + 0x42, 0x4a, 0x52, 0x5a, 0x63, 0x6b, 0x73, 0x7b, + 0x84, 0x8c, 0x94, 0x9c, 0xa5, 0xad, 0xb5, 0xbd, + 0xc5, 0xce, 0xd6, 0xde, 0xe6, 0xef, 0xf7, 0xff, + }; + static const unsigned char convert_6to8[] = + { + 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c, + 0x20, 0x24, 0x28, 0x2d, 0x31, 0x35, 0x39, 0x3d, + 0x41, 0x45, 0x49, 0x4d, 0x51, 0x55, 0x59, 0x5d, + 0x61, 0x65, 0x69, 0x6d, 0x71, 0x75, 0x79, 0x7d, + 0x82, 0x86, 0x8a, 0x8e, 0x92, 0x96, 0x9a, 0x9e, + 0xa2, 0xa6, 0xaa, 0xae, 0xb2, 0xb6, 0xba, 0xbe, + 0xc2, 0xc6, 0xca, 0xce, 0xd2, 0xd7, 0xdb, 0xdf, + 0xe3, 0xe7, 0xeb, 0xef, 0xf3, 0xf7, 0xfb, 0xff, + }; int x; int y; int and_size; @@ -415,6 +433,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) int and_width_bytes, xor_width_bytes; XcursorPixel *pixel_ptr; XcursorImage *image; + unsigned char tmp; BOOL alpha_zero = TRUE; and_width_bytes = ptr->nWidth / 8; @@ -500,11 +519,12 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) case 16: /* BGR, 5 red, 6 green, 5 blue */ - *pixel_ptr = *xor_ptr * 0x1f; - *pixel_ptr |= (*xor_ptr & 0xe0) << 3; - ++xor_ptr; - *pixel_ptr |= (*xor_ptr & 0x07) << 11; - *pixel_ptr |= (*xor_ptr & 0xf8) << 13; + /* [gggbbbbb][rrrrrggg] -> [xxxxxxxx][rrrrrrrr][gggggggg][bbbbbbbb] */ + *pixel_ptr = convert_5to8[*xor_ptr & 0x1f]; + tmp = (*xor_ptr++ & 0xe0) >> 5; + tmp |= (*xor_ptr & 0x07) << 3; + *pixel_ptr |= convert_6to8[tmp] << 16; + *pixel_ptr |= convert_5to8[*xor_ptr & 0xf8] << 24; break; case 1:

1 0

Henri Verbeet : wined3d: Remove the shader_cleanup() method from the shader backend.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 73823ef5f622d6eeeeee1634d8404538e664caa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73823ef5f622d6eeeeee1634d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 16 16:37:37 2008 +0100 wined3d: Remove the shader_cleanup() method from the shader backend. --- dlls/wined3d/arb_program_shader.c | 8 -------- dlls/wined3d/baseshader.c | 2 -- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 7 ------- dlls/wined3d/wined3d_private.h | 1 - 5 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f3fead1..4e959c4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1777,13 +1777,6 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { } } -static void shader_arb_cleanup(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - if (GL_SUPPORT(ARB_VERTEX_PROGRAM)) glDisable(GL_VERTEX_PROGRAM_ARB); - if (GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) glDisable(GL_FRAGMENT_PROGRAM_ARB); -} - static void shader_arb_destroy(IWineD3DBaseShader *iface) { IWineD3DBaseShaderImpl *baseShader = (IWineD3DBaseShaderImpl *) iface; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)baseShader->baseShader.device)->adapter->gl_info; @@ -2183,7 +2176,6 @@ const shader_backend_t arb_program_shader_backend = { shader_arb_select_depth_blt, shader_arb_deselect_depth_blt, shader_arb_load_constants, - shader_arb_cleanup, shader_arb_color_correction, shader_arb_destroy, shader_arb_alloc, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9cc0e2b..6567d77 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1123,7 +1123,6 @@ static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type) {} static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} -static void shader_none_cleanup(IWineD3DDevice *iface) {} static void shader_none_color_correction(const struct SHADER_OPCODE_ARG *arg, struct color_fixup_desc fixup) {} static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} @@ -1171,7 +1170,6 @@ const shader_backend_t none_shader_backend = { shader_none_select_depth_blt, shader_none_deselect_depth_blt, shader_none_load_constants, - shader_none_cleanup, shader_none_color_correction, shader_none_destroy, shader_none_alloc, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9fddf99..c0d65ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1047,7 +1047,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex /* TODO: Use a display list */ /* Disable shaders */ - This->shader_backend->shader_cleanup((IWineD3DDevice *) This); + This->shader_backend->shader_select((IWineD3DDevice *)This, FALSE, FALSE); Context_MarkStateDirty(context, STATE_VSHADER, StateTable); Context_MarkStateDirty(context, STATE_PIXELSHADER, StateTable); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ee0aa6c..0c74535 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3446,12 +3446,6 @@ static void shader_glsl_deselect_depth_blt(IWineD3DDevice *iface) { checkGLcall("glUseProgramObjectARB"); } -static void shader_glsl_cleanup(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - GL_EXTCALL(glUseProgramObjectARB(0)); -} - static void shader_glsl_destroy(IWineD3DBaseShader *iface) { const struct list *linked_programs; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; @@ -3873,7 +3867,6 @@ const shader_backend_t glsl_shader_backend = { shader_glsl_select_depth_blt, shader_glsl_deselect_depth_blt, shader_glsl_load_constants, - shader_glsl_cleanup, shader_glsl_color_correction, shader_glsl_destroy, shader_glsl_alloc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e766372..8ff9814 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -433,7 +433,6 @@ typedef struct { void (*shader_select_depth_blt)(IWineD3DDevice *iface, enum tex_types tex_type); void (*shader_deselect_depth_blt)(IWineD3DDevice *iface); void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); - void (*shader_cleanup)(IWineD3DDevice *iface); void (*shader_color_correction)(const struct SHADER_OPCODE_ARG *arg, struct color_fixup_desc fixup); void (*shader_destroy)(IWineD3DBaseShader *iface); HRESULT (*shader_alloc_private)(IWineD3DDevice *iface);

1 0

Henri Verbeet : d3d9: Fix the shader constant test.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 1e1cf78073c6d0af4c7abd618880d04beda37bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1cf78073c6d0af4c7abd618… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 16 16:37:37 2008 +0100 d3d9: Fix the shader constant test. Using the same values for the test data and the default data masks potential failures. --- dlls/d3d9/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index d2bfcba..f676c3c 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -581,7 +581,7 @@ static const shader_constant_data shader_constant_default_data = { static const shader_constant_data shader_constant_test_data = { { 0xdead0000, 0xdead0001, 0xdead0002, 0xdead0003 }, - { 0.0f, 0.0f, 0.0f, 0.0f }, + { 5.0f, 6.0f, 7.0f, 8.0f }, { TRUE, FALSE, FALSE, TRUE } };

1 0

Henri Verbeet : wined3d: Record floating point pixel shader constants in EndStateBlock() as well.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 78ad5de8da243f7c724e5b3b527c6f2446d00e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ad5de8da243f7c724e5b3b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 16 16:37:37 2008 +0100 wined3d: Record floating point pixel shader constants in EndStateBlock() as well. --- dlls/wined3d/device.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 792426e..326c8ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4868,6 +4868,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW object->num_contained_vs_consts_b++; } } + for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) + { + if (object->changed.pixelShaderConstantsF[i]) + { + object->contained_ps_consts_f[object->num_contained_ps_consts_f] = i; + ++object->num_contained_ps_consts_f; + } + } for(i = 0; i < MAX_CONST_I; i++) { if (object->changed.pixelShaderConstantsI & (1 << i)) {

1 0

Henri Verbeet : wined3d: Remove GetFVF() and SetFVF() from IWineD3DDevice.
by Alexandre Julliard 17 Dec '08

17 Dec '08

Module: wine Branch: master Commit: 4adb342327c520d2bc1f245525666a8c09e358ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4adb342327c520d2bc1f24552… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 16 16:37:36 2008 +0100 wined3d: Remove GetFVF() and SetFVF() from IWineD3DDevice. --- dlls/d3d8/device.c | 3 +- dlls/d3d9/device.c | 16 +++++++++--- dlls/d3d9/tests/vertexdeclaration.c | 46 ++++++++++++++++------------------- dlls/wined3d/device.c | 34 ------------------------- dlls/wined3d/stateblock.c | 12 --------- dlls/wined3d/wined3d_private.h | 3 -- include/wine/wined3d.idl | 6 ---- 7 files changed, 34 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4adb342327c520d2bc1f2…

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 December 2008