December 2008 - Wine-Commits

Ricardo Filipe : clusapi: Add stubs for ClusterEnum, ClusterOpenEnum and ClusterCloseEnum.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 0c406bec4503065e3262f8b24e85da76d5a1c28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c406bec4503065e3262f8b24… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Sat Dec 6 00:20:20 2008 +0000 clusapi: Add stubs for ClusterEnum, ClusterOpenEnum and ClusterCloseEnum. --- dlls/clusapi/clusapi.c | 33 +++++++++++++++++++++++++++++++++ dlls/clusapi/clusapi.spec | 6 +++--- include/clusapi.h | 4 ++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index 252f09b..243c979 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -70,6 +70,39 @@ BOOL WINAPI CloseCluster(HCLUSTER hCluster) } /*********************************************************************** + * ClusterOpenEnum (CLUSAPI.@) + * + */ +HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType) +{ + FIXME("(%p, %u) stub!\n", hCluster,dwType); + + return (HCLUSENUM)0xdeadbeef; +} + +/*********************************************************************** + * ClusterCloseEnum (CLUSAPI.@) + * + */ +DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum) +{ + FIXME("(%p) stub!\n", hEnum); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * ClusterEnum (CLUSAPI.@) + * + */ +DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName) +{ + FIXME("(%p, %u, %u, %s, %u) stub!\n", hEnum, dwIndex, *lpdwType, debugstr_w(lpszName), *lpcchName); + + return ERROR_NO_MORE_ITEMS; +} + +/*********************************************************************** * DllMain (CLUSAPI.@) * */ diff --git a/dlls/clusapi/clusapi.spec b/dlls/clusapi/clusapi.spec index a23af87..5ad0b2e 100644 --- a/dlls/clusapi/clusapi.spec +++ b/dlls/clusapi/clusapi.spec @@ -10,9 +10,9 @@ @ stub CloseClusterNode @ stub CloseClusterNotifyPort @ stub CloseClusterResource -@ stub ClusterCloseEnum +@ stdcall ClusterCloseEnum(ptr) @ stub ClusterControl -@ stub ClusterEnum +@ stdcall ClusterEnum(ptr long ptr wstr ptr) @ stub ClusterGetEnumCount @ stub ClusterGroupCloseEnum @ stub ClusterGroupControl @@ -30,7 +30,7 @@ @ stub ClusterNodeEnum @ stub ClusterNodeGetEnumCount @ stub ClusterNodeOpenEnum -@ stub ClusterOpenEnum +@ stdcall ClusterOpenEnum(ptr long) @ stub ClusterRegCloseKey @ stub ClusterRegCreateKey @ stub ClusterRegDeleteKey diff --git a/include/clusapi.h b/include/clusapi.h index 71e3302..7e04964 100644 --- a/include/clusapi.h +++ b/include/clusapi.h @@ -24,10 +24,14 @@ extern "C" { #endif typedef struct _HCLUSTER *HCLUSTER; +typedef struct _HCLUSENUM *HCLUSENUM; BOOL WINAPI CloseCluster(HCLUSTER hCluster); DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName); +HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType); +DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName); +DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum); #ifdef __cplusplus }

1 0

Hans Leidekker : clusapi: Add stubs for OpenCluster and CloseCluster.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 5dd5c225061ad032914e8d142cb7055ba4b62553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd5c225061ad032914e8d142… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Fri Dec 5 23:42:51 2008 +0000 clusapi: Add stubs for OpenCluster and CloseCluster. --- dlls/clusapi/clusapi.c | 21 +++++++++++++++++++++ dlls/clusapi/clusapi.spec | 4 ++-- include/clusapi.h | 4 ++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index 734676c..252f09b 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -47,6 +47,27 @@ DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState) return ERROR_SUCCESS; } +/*********************************************************************** + * OpenCluster (CLUSAPI.@) + * + */ +HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName) +{ + FIXME("(%s) stub!\n", debugstr_w(lpszClusterName)); + + return (HCLUSTER)0xdeadbeef; +} + +/*********************************************************************** + * CloseCluster (CLUSAPI.@) + * + */ +BOOL WINAPI CloseCluster(HCLUSTER hCluster) +{ + FIXME("(%p) stub!\n", hCluster); + + return TRUE; +} /*********************************************************************** * DllMain (CLUSAPI.@) diff --git a/dlls/clusapi/clusapi.spec b/dlls/clusapi/clusapi.spec index 6972f9b..a23af87 100644 --- a/dlls/clusapi/clusapi.spec +++ b/dlls/clusapi/clusapi.spec @@ -3,7 +3,7 @@ @ stub BackupClusterDatabase @ stub CanResourceBeDependent @ stub ChangeClusterResourceGroup -@ stub CloseCluster +@ stdcall CloseCluster(ptr) @ stub CloseClusterGroup @ stub CloseClusterNetInterface @ stub CloseClusterNetwork @@ -93,7 +93,7 @@ @ stub OfflineClusterResource @ stub OnlineClusterGroup @ stub OnlineClusterResource -@ stub OpenCluster +@ stdcall OpenCluster(wstr) @ stub OpenClusterGroup @ stub OpenClusterNetInterface @ stub OpenClusterNetwork diff --git a/include/clusapi.h b/include/clusapi.h index ff4577f..71e3302 100644 --- a/include/clusapi.h +++ b/include/clusapi.h @@ -23,7 +23,11 @@ extern "C" { #endif +typedef struct _HCLUSTER *HCLUSTER; + +BOOL WINAPI CloseCluster(HCLUSTER hCluster); DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); +HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName); #ifdef __cplusplus }

1 0

Alexandre Julliard : server: Don't use size_t for module sizes, they are limited to 2Gb anyway.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 77cf8034e47be06951861af35b8c7ce931c97f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=77cf8034e47be06951861af35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 11:50:05 2008 +0100 server: Don't use size_t for module sizes, they are limited to 2Gb anyway. --- include/wine/server_protocol.h | 8 ++++---- server/process.h | 2 +- server/protocol.def | 6 +++--- server/trace.c | 6 +++--- tools/make_requests | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 39a4bee..9f32b30 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -670,8 +670,8 @@ struct get_dll_info_request struct get_dll_info_reply { struct reply_header __header; - size_t size; void* entry_point; + data_size_t size; data_size_t filename_len; /* VARARG(filename,unicode_str); */ }; @@ -709,10 +709,10 @@ struct load_dll_request struct request_header __header; obj_handle_t handle; void* base; - size_t size; + void* name; + data_size_t size; int dbg_offset; int dbg_size; - void* name; /* VARARG(filename,unicode_str); */ }; struct load_dll_reply @@ -5046,6 +5046,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 348 +#define SERVER_PROTOCOL_VERSION 349 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.h b/server/process.h index 52b3d26..c2bb8c3 100644 --- a/server/process.h +++ b/server/process.h @@ -38,8 +38,8 @@ struct process_dll struct list entry; /* entry in per-process dll list */ struct file *file; /* dll file */ void *base; /* dll base address (in process addr space) */ - size_t size; /* dll size */ void *name; /* ptr to ptr to name (in process addr space) */ + data_size_t size; /* dll size */ int dbg_offset; /* debug info offset */ int dbg_size; /* debug info size */ data_size_t namelen; /* length of dll file name */ diff --git a/server/protocol.def b/server/protocol.def index 804a580..eba1b82 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -618,8 +618,8 @@ typedef union obj_handle_t handle; /* process handle */ void* base_address; /* base address of module */ @REPLY - size_t size; /* module size */ void* entry_point; + data_size_t size; /* module size */ data_size_t filename_len; /* buffer len in bytes required to store filename */ VARARG(filename,unicode_str); /* file name of module */ @END @@ -645,10 +645,10 @@ typedef union @REQ(load_dll) obj_handle_t handle; /* file handle */ void* base; /* base address */ - size_t size; /* dll size */ + void* name; /* ptr to ptr to name (in process addr space) */ + data_size_t size; /* dll size */ int dbg_offset; /* debug info offset */ int dbg_size; /* debug info size */ - void* name; /* ptr to ptr to name (in process addr space) */ VARARG(filename,unicode_str); /* file name of dll */ @END diff --git a/server/trace.c b/server/trace.c index d8c2845..9f15855 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1014,8 +1014,8 @@ static void dump_get_dll_info_request( const struct get_dll_info_request *req ) static void dump_get_dll_info_reply( const struct get_dll_info_reply *req ) { - fprintf( stderr, " size=%lu,", (unsigned long)req->size ); fprintf( stderr, " entry_point=%p,", req->entry_point ); + fprintf( stderr, " size=%u,", req->size ); fprintf( stderr, " filename_len=%u,", req->filename_len ); fprintf( stderr, " filename=" ); dump_varargs_unicode_str( cur_size ); @@ -1045,10 +1045,10 @@ static void dump_load_dll_request( const struct load_dll_request *req ) { fprintf( stderr, " handle=%04x,", req->handle ); fprintf( stderr, " base=%p,", req->base ); - fprintf( stderr, " size=%lu,", (unsigned long)req->size ); + fprintf( stderr, " name=%p,", req->name ); + fprintf( stderr, " size=%u,", req->size ); fprintf( stderr, " dbg_offset=%d,", req->dbg_offset ); fprintf( stderr, " dbg_size=%d,", req->dbg_size ); - fprintf( stderr, " name=%p,", req->name ); fprintf( stderr, " filename=" ); dump_varargs_unicode_str( cur_size ); } diff --git a/tools/make_requests b/tools/make_requests index ef4e8b5..76be7b2 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -31,7 +31,6 @@ my %formats = "unsigned int" => "%08x", "unsigned long" => "%lx", "void*" => "%p", - "size_t" => "%lu (unsigned long)", "data_size_t" => "%u", "obj_handle_t" => "%04x", "atom_t" => "%04x",

1 0

Alexandre Julliard : server: Get rid of the support for module snapshots, it is no longer needed.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: db6e45488d1a83693098933eaf0107006012f18c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6e45488d1a83693098933ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 11:49:37 2008 +0100 server: Get rid of the support for module snapshots, it is no longer needed. --- dlls/ntdll/nt.c | 1 - include/wine/server_protocol.h | 33 ++-------------- server/process.c | 24 ----------- server/process.h | 9 ---- server/protocol.def | 23 +---------- server/request.h | 2 - server/snapshot.c | 83 ++------------------------------------- server/trace.c | 23 +---------- 8 files changed, 13 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db6e45488d1a836930989…

1 0

Alexandre Julliard : wininet: Include ws2tcpip. h before anything else for the Windows build.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 82280618db677535e98831dafd49683e1770c09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=82280618db677535e98831daf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 11:33:25 2008 +0100 wininet: Include ws2tcpip.h before anything else for the Windows build. --- dlls/wininet/cookie.c | 4 ++++ dlls/wininet/dialogs.c | 4 ++++ dlls/wininet/ftp.c | 4 ++++ dlls/wininet/http.c | 4 ++++ dlls/wininet/internet.c | 4 ++++ dlls/wininet/internet.h | 1 - dlls/wininet/netconnection.c | 4 ++++ dlls/wininet/urlcache.c | 14 +++++++++++--- dlls/wininet/utility.c | 4 ++++ 9 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 12d841b..1ee8809 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -23,6 +23,10 @@ #include "config.h" #include "wine/port.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index dd5aa31..41494a6 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -21,6 +21,10 @@ #include "config.h" #include "wine/port.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <stdarg.h> #include "windef.h" diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 396f1ef..7dcbeb3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -30,6 +30,10 @@ #include "config.h" #include "wine/port.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <errno.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4a9954b..2b9b95f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -29,6 +29,10 @@ #include "config.h" #include "wine/port.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5dbbc48..94ff541 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -31,6 +31,10 @@ #define MAXHOSTNAME 100 /* from http.c */ +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <string.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index bb694e9..d8da781 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -43,7 +43,6 @@ #endif #if defined(__MINGW32__) || defined (_MSC_VER) -#include "ws2tcpip.h" #ifndef MSG_WAITALL #define MSG_WAITALL 0 #endif diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e688a51..d8bdf45 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -23,6 +23,10 @@ #include "config.h" #include "wine/port.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <sys/types.h> #ifdef HAVE_POLL_H #include <poll.h> diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index fe3bc5b..d1d54ae 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -25,15 +25,23 @@ #include "config.h" #include "wine/port.h" +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif #include <time.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index ff914f4..b68cf8d 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -25,6 +25,10 @@ #include "config.h" #include "wine/port.h" +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#endif + #include <stdarg.h> #include <stdlib.h> #include <string.h>

1 0

Henri Verbeet : wined3d: Fix some spelling errors.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: ce4d03318b71c3ec2b350d0f58eb185af64a1e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4d03318b71c3ec2b350d0f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 9 09:52:39 2008 +0100 wined3d: Fix some spelling errors. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/vertexbuffer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3faa17c..5eb8539 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3402,7 +3402,7 @@ static BOOL gen_yv12_read(SHADER_BUFFER *buffer, GLenum textype, char *luminance shader_addline(buffer, "MIN texcrd.y, temp.y, texcrd.y;\n"); shader_addline(buffer, "TEX luminance, texcrd, texture[0], %s;\n", tex); } else { - /* Reading from texture_rectangles is pretty streightforward, just use the unmodified + /* Reading from texture_rectangles is pretty straightforward, just use the unmodified * texture coordinate. It is still a good idea to clamp it though, since the opengl texture * is bigger */ @@ -3446,7 +3446,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu * contains the luminance and alpha the chroma. With UYVY it is vice versa. Thus * take the format into account when generating the read swizzles * - * Reading the Y value is streightforward - just sample the texture. The hardware + * Reading the Y value is straightforward - just sample the texture. The hardware * takes care of filtering in the horizontal and vertical direction. * * Reading the U and V values is harder. We have to avoid filtering horizontally, diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 5964033..014ced6 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -328,7 +328,7 @@ static inline BOOL IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T * depend on the semantic as well, for example a FLOAT4 texcoord needs no conversion while a FLOAT4 positiont needs one */ if(use_vs(device)) { - TRACE("vhsader\n"); + TRACE("vshader\n"); /* If the current vertex declaration is marked for no half float conversion don't bother to * analyse the strided streams in depth, just set them up for no conversion. Return decl changed * if we used conversion before

1 0

Alexandre Julliard : include: Added the msvcrt memory.h header.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 956f19fa1b82f802d8cc6ce5e671f1e48cc0cd39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956f19fa1b82f802d8cc6ce5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 9 11:30:53 2008 +0100 include: Added the msvcrt memory.h header. --- include/Makefile.in | 1 + include/msvcrt/memory.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/string.h | 17 +++++++++----- 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 3254080..de25bbf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -304,6 +304,7 @@ SRCDIR_INCLUDES = \ msvcrt/math.h \ msvcrt/mbctype.h \ msvcrt/mbstring.h \ + msvcrt/memory.h \ msvcrt/process.h \ msvcrt/search.h \ msvcrt/setjmp.h \ diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h new file mode 100644 index 0000000..a5217df --- /dev/null +++ b/include/msvcrt/memory.h @@ -0,0 +1,58 @@ +/* + * Memory definitions + * + * Derived from the mingw header written by Colin Peters. + * Modified for Wine use by Jon Griffiths and Francois Gouget. + * This file is in the public domain. + */ +#ifndef __WINE_MEMORY_H +#define __WINE_MEMORY_H +#ifndef __WINE_USE_MSVCRT +#define __WINE_USE_MSVCRT +#endif + +#if defined(__x86_64__) && !defined(_WIN64) +#define _WIN64 +#endif + +#if !defined(_MSC_VER) && !defined(__int64) +# ifdef _WIN64 +# define __int64 long +# else +# define __int64 long long +# endif +#endif + +#ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else +typedef unsigned int size_t; +#endif +#define _SIZE_T_DEFINED +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _CRT_MEMORY_DEFINED +#define _CRT_MEMORY_DEFINED + +void* memchr(const void*,int,size_t); +int memcmp(const void*,const void*,size_t); +void* memcpy(void*,const void*,size_t); +void* memset(void*,int,size_t); +void* _memccpy(void*,const void*,int,unsigned int); +int _memicmp(const void*,const void*,unsigned int); + +static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } +static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } + +#endif /* _CRT_MEMORY_DEFINED */ + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_MEMORY_H */ diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 327945e..a963553 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -56,8 +56,19 @@ typedef unsigned int size_t; extern "C" { #endif +#ifndef _CRT_MEMORY_DEFINED +#define _CRT_MEMORY_DEFINED +void* memchr(const void*,int,size_t); +int memcmp(const void*,const void*,size_t); +void* memcpy(void*,const void*,size_t); +void* memset(void*,int,size_t); void* _memccpy(void*,const void*,int,unsigned int); int _memicmp(const void*,const void*,unsigned int); + +static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } +static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } +#endif /* _CRT_MEMORY_DEFINED */ + int _strcmpi(const char*,const char*); char* _strdup(const char*); char* _strerror(const char*); @@ -70,11 +81,7 @@ char* _strrev(char*); char* _strset(char*,int); char* _strupr(char*); -void* memchr(const void*,int,size_t); -int memcmp(const void*,const void*,size_t); -void* memcpy(void*,const void*,size_t); void* memmove(void*,const void*,size_t); -void* memset(void*,int,size_t); char* strcat(char*,const char*); char* strchr(const char*,int); int strcmp(const char*,const char*); @@ -128,8 +135,6 @@ size_t wcsxfrm(wchar_t*,const wchar_t*,size_t); #endif -static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } -static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline int strcasecmp(const char* s1, const char* s2) { return _stricmp(s1, s2); } static inline int strcmpi(const char* s1, const char* s2) { return _strcmpi(s1, s2); } static inline char* strdup(const char* buf) { return _strdup(buf); }

1 0

Henri Verbeet : wined3d: Fix the IWineD3DVertexShader and IWineD3DPixelShader IUnknown methods.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 50a87e23e70744c8b881fa2943aece617ab5a158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a87e23e70744c8b881fa294… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 9 09:52:39 2008 +0100 wined3d: Fix the IWineD3DVertexShader and IWineD3DPixelShader IUnknown methods. IWineD3DVertexShader isn't supposed to implement IWineD3DPixelShader. --- dlls/wined3d/baseshader.c | 55 ++++++++------------------------------- dlls/wined3d/pixelshader.c | 37 ++++++++++++++++++++++++-- dlls/wined3d/vertexshader.c | 37 ++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 81 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9414292..8cd2490 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1158,6 +1158,18 @@ void shader_trace_init( This->baseShader.functionLength = (len + 1) * sizeof(DWORD); } +void shader_cleanup(IWineD3DBaseShader *iface) +{ + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; + + ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_destroy(iface); + HeapFree(GetProcessHeap(), 0, This->baseShader.function); + shader_delete_constant_list(&This->baseShader.constantsF); + shader_delete_constant_list(&This->baseShader.constantsB); + shader_delete_constant_list(&This->baseShader.constantsI); + list_remove(&This->baseShader.shader_list_entry); +} + static const SHADER_HANDLER shader_none_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = {0}; 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) {} @@ -1222,46 +1234,3 @@ const shader_backend_t none_shader_backend = { shader_none_get_caps, shader_none_color_fixup_supported, }; - -/* ******************************************* - IWineD3DPixelShader IUnknown parts follow - ******************************************* */ -HRESULT WINAPI IWineD3DBaseShaderImpl_QueryInterface(IWineD3DBaseShader *iface, REFIID riid, LPVOID *ppobj) -{ - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DBaseShader) - || IsEqualGUID(riid, &IID_IWineD3DPixelShader)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - *ppobj = NULL; - return E_NOINTERFACE; -} - -ULONG WINAPI IWineD3DBaseShaderImpl_AddRef(IWineD3DBaseShader *iface) { - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - TRACE("(%p) : AddRef increasing from %d\n", This, This->baseShader.ref); - return InterlockedIncrement(&This->baseShader.ref); -} - -ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface) { - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; - IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; - ULONG ref; - TRACE("(%p) : Releasing from %d\n", This, This->baseShader.ref); - ref = InterlockedDecrement(&This->baseShader.ref); - if (ref == 0) { - deviceImpl->shader_backend->shader_destroy(iface); - HeapFree(GetProcessHeap(), 0, This->baseShader.function); - shader_delete_constant_list(&This->baseShader.constantsF); - shader_delete_constant_list(&This->baseShader.constantsB); - shader_delete_constant_list(&This->baseShader.constantsI); - list_remove(&This->baseShader.shader_list_entry); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 09a99dc..f8dd4a3 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -37,15 +37,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLNAME_REQUIRE_GLSL ((const char *)1) static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { - return IWineD3DBaseShaderImpl_QueryInterface((IWineD3DBaseShader *) iface, riid, ppobj); + TRACE("iface %p, riid %s, ppobj %p\n", iface, debugstr_guid(riid), ppobj); + + if (IsEqualGUID(riid, &IID_IWineD3DPixelShader) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppobj = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *ppobj = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IWineD3DPixelShaderImpl_AddRef(IWineD3DPixelShader *iface) { - return IWineD3DBaseShaderImpl_AddRef((IWineD3DBaseShader *) iface); + IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; + ULONG refcount = InterlockedIncrement(&This->baseShader.ref); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; } static ULONG WINAPI IWineD3DPixelShaderImpl_Release(IWineD3DPixelShader *iface) { - return IWineD3DBaseShaderImpl_Release((IWineD3DBaseShader *) iface); + IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; + ULONG refcount = InterlockedDecrement(&This->baseShader.ref); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + shader_cleanup((IWineD3DBaseShader *)iface); + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; } /* ******************************************* diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 9c47930..e153a1f 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -334,15 +334,46 @@ static void IWineD3DVertexShaderImpl_GenerateShader(IWineD3DVertexShader *iface, IWineD3DVertexShader IUnknown parts follow ******************************************* */ static HRESULT WINAPI IWineD3DVertexShaderImpl_QueryInterface(IWineD3DVertexShader *iface, REFIID riid, LPVOID *ppobj) { - return IWineD3DBaseShaderImpl_QueryInterface((IWineD3DBaseShader *) iface, riid, ppobj); + TRACE("iface %p, riid %s, ppobj %p\n", iface, debugstr_guid(riid), ppobj); + + if (IsEqualGUID(riid, &IID_IWineD3DVertexShader) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppobj = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *ppobj = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IWineD3DVertexShaderImpl_AddRef(IWineD3DVertexShader *iface) { - return IWineD3DBaseShaderImpl_AddRef((IWineD3DBaseShader *) iface); + IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; + ULONG refcount = InterlockedIncrement(&This->baseShader.ref); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; } static ULONG WINAPI IWineD3DVertexShaderImpl_Release(IWineD3DVertexShader *iface) { - return IWineD3DBaseShaderImpl_Release((IWineD3DBaseShader *) iface); + IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; + ULONG refcount = InterlockedDecrement(&This->baseShader.ref); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + shader_cleanup((IWineD3DBaseShader *)iface); + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; } /* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4464f9..619baec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2226,11 +2226,9 @@ typedef struct IWineD3DBaseShaderImpl { IWineD3DBaseShaderClass baseShader; } IWineD3DBaseShaderImpl; -HRESULT WINAPI IWineD3DBaseShaderImpl_QueryInterface(IWineD3DBaseShader *iface, REFIID riid, LPVOID *ppobj); -ULONG WINAPI IWineD3DBaseShaderImpl_AddRef(IWineD3DBaseShader *iface); -ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface); void shader_buffer_init(struct SHADER_BUFFER *buffer); void shader_buffer_free(struct SHADER_BUFFER *buffer); +void shader_cleanup(IWineD3DBaseShader *iface); extern HRESULT shader_get_registers_used( IWineD3DBaseShader *iface,

1 0

Henri Verbeet : wined3d: Add functions to initialize and free shader buffers.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: 4997bee1bf51017df665588886e50cd42853b1e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4997bee1bf51017df66558888… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 9 09:52:38 2008 +0100 wined3d: Add functions to initialize and free shader buffers. --- dlls/wined3d/arb_program_shader.c | 22 ++++++++-------------- dlls/wined3d/baseshader.c | 14 ++++++++++++++ dlls/wined3d/glsl_shader.c | 7 ++----- dlls/wined3d/pixelshader.c | 9 ++------- dlls/wined3d/vertexshader.c | 9 ++------- dlls/wined3d/wined3d_private.h | 2 ++ 6 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9d51250..3faa17c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2694,10 +2694,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi } /* Shader header */ - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); + shader_buffer_init(&buffer); shader_addline(&buffer, "!!ARBfp1.0\n"); @@ -2888,7 +2885,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return ret; } @@ -3426,10 +3423,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu struct arbfp_blit_priv *priv = (struct arbfp_blit_priv *) device->blit_priv; /* Shader header */ - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); + shader_buffer_init(&buffer); ENTER_GL(); GL_EXTCALL(glGenProgramsARB(1, &shader)); @@ -3438,7 +3432,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); LEAVE_GL(); if(!shader) { - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return 0; } @@ -3493,7 +3487,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu case YUV_FIXUP_YUY2: if (!gen_planar_yuv_read(&buffer, yuv_fixup, textype, &luminance_component)) { - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return 0; } break; @@ -3501,14 +3495,14 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu case YUV_FIXUP_YV12: if (!gen_yv12_read(&buffer, textype, &luminance_component)) { - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return 0; } break; default: FIXME("Unsupported YUV fixup %#x\n", yuv_fixup); - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return 0; } @@ -3533,7 +3527,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); LEAVE_GL(); switch (yuv_fixup) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c0b149f..9414292 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -40,6 +40,20 @@ static inline BOOL shader_is_version_token(DWORD token) { shader_is_vshader_version(token); } +void shader_buffer_init(struct SHADER_BUFFER *buffer) +{ + buffer->buffer = HeapAlloc(GetProcessHeap(), 0, SHADER_PGMSIZE); + buffer->buffer[0] = '\0'; + buffer->bsize = 0; + buffer->lineNo = 0; + buffer->newline = TRUE; +} + +void shader_buffer_free(struct SHADER_BUFFER *buffer) +{ + HeapFree(GetProcessHeap(), 0, buffer->buffer); +} + int shader_addline( SHADER_BUFFER* buffer, const char *format, ...) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4c1d223..f1a0f95 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2958,10 +2958,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs char reg_mask[6]; const struct semantic *semantics_out, *semantics_in; - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; + shader_buffer_init(&buffer); shader_addline(&buffer, "#version 120\n"); @@ -3093,7 +3090,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs GL_EXTCALL(glCompileShaderARB(ret)); checkGLcall("glCompileShaderARB(ret)"); - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return ret; } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 6a4d7d5..09a99dc 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -277,14 +277,9 @@ static inline GLuint IWineD3DPixelShaderImpl_GenerateShader( SHADER_BUFFER buffer; GLuint shader; - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; - + shader_buffer_init(&buffer); shader = ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer); - - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); return shader; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 3180262..9c47930 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -325,14 +325,9 @@ static void IWineD3DVertexShaderImpl_GenerateShader(IWineD3DVertexShader *iface, find_swizzled_attribs(decl, This); - buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); - buffer.bsize = 0; - buffer.lineNo = 0; - buffer.newline = TRUE; - + shader_buffer_init(&buffer); ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_vshader(iface, &buffer); - - HeapFree(GetProcessHeap(), 0, buffer.buffer); + shader_buffer_free(&buffer); } /* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 359be44..b4464f9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2229,6 +2229,8 @@ typedef struct IWineD3DBaseShaderImpl { HRESULT WINAPI IWineD3DBaseShaderImpl_QueryInterface(IWineD3DBaseShader *iface, REFIID riid, LPVOID *ppobj); ULONG WINAPI IWineD3DBaseShaderImpl_AddRef(IWineD3DBaseShader *iface); ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface); +void shader_buffer_init(struct SHADER_BUFFER *buffer); +void shader_buffer_free(struct SHADER_BUFFER *buffer); extern HRESULT shader_get_registers_used( IWineD3DBaseShader *iface,

1 0

Henri Verbeet : wined3d: Don' t leak memory in IWineD3DPixelShaderImpl_GenerateShader().
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: acbdd807b6164e155357a9c8a49692dc574d7e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbdd807b6164e155357a9c8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 9 09:52:38 2008 +0100 wined3d: Don't leak memory in IWineD3DPixelShaderImpl_GenerateShader(). This fixes a regression introduced by commit 0bf32b12f5a97045c4c2785260961e53184c29ce. --- dlls/wined3d/pixelshader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 0557d86..6a4d7d5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -275,13 +275,18 @@ static void pshader_set_limits( static inline GLuint IWineD3DPixelShaderImpl_GenerateShader( IWineD3DPixelShaderImpl *This) { SHADER_BUFFER buffer; + GLuint shader; buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); buffer.bsize = 0; buffer.lineNo = 0; buffer.newline = TRUE; - return ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *) This, &buffer); + shader = ((IWineD3DDeviceImpl *)This->baseShader.device)->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer); + + HeapFree(GetProcessHeap(), 0, buffer.buffer); + + return shader; } static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *iface, CONST DWORD *pFunction) {

1 0