September 2013 - Wine-Commits

Frédéric Delanoy : kernel32: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 6918c86544779165c44b6707bd4d63d88ffeb4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6918c86544779165c44b6707b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 26 08:42:49 2013 +0200 kernel32: Use BOOL type where appropriate. --- dlls/kernel32/process.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6ce43d8..6b4d9b4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -738,19 +738,20 @@ static BOOL build_command_line( WCHAR **argv ) len = 0; for (arg = argv; *arg; arg++) { - int has_space,bcount; + BOOL has_space; + int bcount; WCHAR* a; - has_space=0; + has_space=FALSE; bcount=0; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space=TRUE; while (*a!='\0') { if (*a=='\\') { bcount++; } else { if (*a==' ' || *a=='\t') { - has_space=1; + has_space=TRUE; } else if (*a=='"') { /* doubling of '\' preceding a '"', * plus escaping of said '"' @@ -774,20 +775,20 @@ static BOOL build_command_line( WCHAR **argv ) rupp->CommandLine.MaximumLength = len * sizeof(WCHAR); for (arg = argv; *arg; arg++) { - int has_space,has_quote; + BOOL has_space,has_quote; WCHAR* a; /* Check for quotes and spaces in this argument */ - has_space=has_quote=0; + has_space=has_quote=FALSE; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space=TRUE; while (*a!='\0') { if (*a==' ' || *a=='\t') { - has_space=1; + has_space=TRUE; if (has_quote) break; } else if (*a=='"') { - has_quote=1; + has_quote=TRUE; if (has_space) break; }

1 0

Huw Davies : server: Android declares syscall() in sys/syscall.h .
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: b47a391e9326bd4ff26e64cbae8b74d9e40907be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47a391e9326bd4ff26e64cba… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 26 11:15:15 2013 +0100 server: Android declares syscall() in sys/syscall.h . --- server/fd.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/fd.c b/server/fd.c index 16e4196..32b2a29 100644 --- a/server/fd.c +++ b/server/fd.c @@ -88,6 +88,9 @@ #include <sys/time.h> #include <sys/types.h> #include <unistd.h> +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Alexandre Julliard : libwine: Look for all libraries in the dll search path on Android.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 626be2eab12e75bbfe198621875218feb93c19ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=626be2eab12e75bbfe1986218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 18:15:08 2013 +0200 libwine: Look for all libraries in the dll search path on Android. --- libs/wine/loader.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 01cc57a..5891a20 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -902,6 +902,23 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ret = dlopen( path, flag | RTLD_FIRST ); } else +#elif defined(__ANDROID__) + if (!strchr( filename, '/' ) && nb_dll_paths) + { + unsigned int i; + char *buffer = malloc( dll_path_maxlen + strlen(filename) + 2 ); + + buffer[dll_path_maxlen] = '/'; + strcpy( buffer + dll_path_maxlen + 1, filename ); + for (i = 0; i < nb_dll_paths; i++) + { + char *path = prepend( buffer + dll_path_maxlen, dll_paths[i], strlen(dll_paths[i]) ); + ret = dlopen( path, flag | RTLD_FIRST ); + if (ret) break; + } + free( buffer ); + if (ret) return ret; + } #endif ret = dlopen( filename, flag | RTLD_FIRST ); s = dlerror();

1 0

Alexandre Julliard : configure: Store all libraries in libdir on Android.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 770d902d10ab7d3ca096a4cd099fa52ca1abe711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770d902d10ab7d3ca096a4cd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 17:58:38 2013 +0200 configure: Store all libraries in libdir on Android. --- Make.vars.in | 2 +- configure | 4 ++++ configure.ac | 2 ++ 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 133da5f..ea3869d 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -10,7 +10,7 @@ infodir = @infodir@ mandir = @mandir@ fontdir = $(datadir)/wine/fonts includedir = @includedir@/wine -dlldir = @libdir@/wine +dlldir = @dlldir@ fakedlldir = $(dlldir)/fakedlls top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ diff --git a/configure b/configure index 317bade..a296e67 100755 --- a/configure +++ b/configure @@ -715,6 +715,7 @@ IMPLIBEXT DLLFLAGS DLLPREFIX DLLEXT +dlldir CPP OPENGL_LIBS XLIB @@ -6408,6 +6409,8 @@ done +dlldir="\${libdir}/wine" + DLLEXT="" DLLPREFIX="" @@ -6904,6 +6907,7 @@ clean:: DLLFLAGS="$DLLFLAGS -fPIC" DLLEXT=".so" DLLPREFIX="lib" + dlldir="\${libdir}" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : diff --git a/configure.ac b/configure.ac index 8ac0216..dacee3a 100644 --- a/configure.ac +++ b/configure.ac @@ -676,6 +676,7 @@ AC_CHECK_HEADERS([libprocstat.h],,, dnl **** Check for working dll **** +AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLEXT,"") AC_SUBST(DLLPREFIX,"") AC_SUBST(DLLFLAGS,"-D_REENTRANT") @@ -873,6 +874,7 @@ clean:: DLLFLAGS="$DLLFLAGS -fPIC" DLLEXT=".so" DLLPREFIX="lib" + dlldir="\${libdir}" WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXFileEnumObjectImpl typedef.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 38871d842fd97d48dd11b7e479f0090fa2a16ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38871d842fd97d48dd11b7e47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:57 2013 +0200 d3dx9: Get rid of the ID3DXFileEnumObjectImpl typedef. --- dlls/d3dx9_36/xfile.c | 120 +++++++++++++++++++++++------------------------- 1 files changed, 58 insertions(+), 62 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 8c14353..1138587 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -53,12 +53,13 @@ struct d3dx9_file IDirectXFile *dxfile; }; -typedef struct { +struct d3dx9_file_enum_object +{ ID3DXFileEnumObject ID3DXFileEnumObject_iface; LONG ref; ULONG nb_children; ID3DXFileData **children; -} ID3DXFileEnumObjectImpl; +}; typedef struct { ID3DXFileData ID3DXFileData_iface; @@ -75,9 +76,9 @@ static inline struct d3dx9_file *impl_from_ID3DXFile(ID3DXFile *iface) return CONTAINING_RECORD(iface, struct d3dx9_file, ID3DXFile_iface); } -static inline ID3DXFileEnumObjectImpl* impl_from_ID3DXFileEnumObject(ID3DXFileEnumObject *iface) +static inline struct d3dx9_file_enum_object *impl_from_ID3DXFileEnumObject(ID3DXFileEnumObject *iface) { - return CONTAINING_RECORD(iface, ID3DXFileEnumObjectImpl, ID3DXFileEnumObject_iface); + return CONTAINING_RECORD(iface, struct d3dx9_file_enum_object, ID3DXFileEnumObject_iface); } static inline ID3DXFileDataImpl* impl_from_ID3DXFileData(ID3DXFileData *iface) @@ -374,124 +375,119 @@ static HRESULT ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DX return S_OK; } - -/*** IUnknown methods ***/ - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_QueryInterface(ID3DXFileEnumObject *iface, REFIID riid, void **ret_iface) +static HRESULT WINAPI d3dx9_file_enum_object_QueryInterface(ID3DXFileEnumObject *iface, REFIID riid, void **out) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXFileEnumObject)) + if (IsEqualGUID(riid, &IID_ID3DXFileEnumObject) + || IsEqualGUID(riid, &IID_IUnknown)) { iface->lpVtbl->AddRef(iface); - *ret_iface = iface; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); - *ret_iface = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; } -static ULONG WINAPI ID3DXFileEnumObjectImpl_AddRef(ID3DXFileEnumObject *iface) +static ULONG WINAPI d3dx9_file_enum_object_AddRef(ID3DXFileEnumObject *iface) { - ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface); + ULONG refcount = InterlockedIncrement(&file_enum->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", file_enum, refcount); - return ref; + return refcount; } -static ULONG WINAPI ID3DXFileEnumObjectImpl_Release(ID3DXFileEnumObject *iface) +static ULONG WINAPI d3dx9_file_enum_object_Release(ID3DXFileEnumObject *iface) { - ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface); + ULONG refcount = InterlockedDecrement(&file_enum->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", file_enum, refcount); - if (!ref) + if (!refcount) { ULONG i; - for (i = 0; i < This->nb_children; i++) - (This->children[i])->lpVtbl->Release(This->children[i]); - HeapFree(GetProcessHeap(), 0, This->children); - HeapFree(GetProcessHeap(), 0, This); + for (i = 0; i < file_enum->nb_children; ++i) + { + ID3DXFileData *child = file_enum->children[i]; + child->lpVtbl->Release(child); + } + HeapFree(GetProcessHeap(), 0, file_enum->children); + HeapFree(GetProcessHeap(), 0, file_enum); } - return ref; + return refcount; } - -/*** ID3DXFileEnumObject methods ***/ - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetFile(ID3DXFileEnumObject *iface, ID3DXFile **file) +static HRESULT WINAPI d3dx9_file_enum_object_GetFile(ID3DXFileEnumObject *iface, ID3DXFile **file) { - FIXME("(%p)->(%p): stub\n", iface, file); + FIXME("iface %p, file %p stub!\n", iface, file); return E_NOTIMPL; } - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetChildren(ID3DXFileEnumObject *iface, SIZE_T *children) +static HRESULT WINAPI d3dx9_file_enum_object_GetChildren(ID3DXFileEnumObject *iface, SIZE_T *children) { - ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); + struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface); - TRACE("(%p)->(%p)\n", iface, children); + TRACE("iface %p, children %p.\n", iface, children); if (!children) return E_POINTER; - *children = This->nb_children; + *children = file_enum->nb_children; return S_OK; } - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetChild(ID3DXFileEnumObject *iface, SIZE_T id, ID3DXFileData **object) +static HRESULT WINAPI d3dx9_file_enum_object_GetChild(ID3DXFileEnumObject *iface, SIZE_T id, ID3DXFileData **object) { - ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); + struct d3dx9_file_enum_object *file_enum = impl_from_ID3DXFileEnumObject(iface); - TRACE("(%p)->(%lu, %p)\n", iface, id, object); + TRACE("iface %p, id %#lx, object %p.\n", iface, id, object); if (!object) return E_POINTER; - *object = This->children[id]; + *object = file_enum->children[id]; (*object)->lpVtbl->AddRef(*object); return S_OK; } - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetDataObjectById(ID3DXFileEnumObject *iface, REFGUID guid, ID3DXFileData **object) +static HRESULT WINAPI d3dx9_file_enum_object_GetDataObjectById(ID3DXFileEnumObject *iface, + REFGUID guid, ID3DXFileData **object) { - FIXME("(%p)->(%s, %p): stub\n", iface, debugstr_guid(guid), object); + FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); return E_NOTIMPL; } - -static HRESULT WINAPI ID3DXFileEnumObjectImpl_GetDataObjectByName(ID3DXFileEnumObject *iface, const char *name, ID3DXFileData **object) +static HRESULT WINAPI d3dx9_file_enum_object_GetDataObjectByName(ID3DXFileEnumObject *iface, + const char *name, ID3DXFileData **object) { - FIXME("(%p)->(%s, %p): stub\n", iface, debugstr_a(name), object); + FIXME("iface %p, name %s, object %p stub!\n", iface, debugstr_a(name), object); return E_NOTIMPL; } - -static const ID3DXFileEnumObjectVtbl ID3DXFileEnumObject_Vtbl = +static const ID3DXFileEnumObjectVtbl d3dx9_file_enum_object_vtbl = { - ID3DXFileEnumObjectImpl_QueryInterface, - ID3DXFileEnumObjectImpl_AddRef, - ID3DXFileEnumObjectImpl_Release, - ID3DXFileEnumObjectImpl_GetFile, - ID3DXFileEnumObjectImpl_GetChildren, - ID3DXFileEnumObjectImpl_GetChild, - ID3DXFileEnumObjectImpl_GetDataObjectById, - ID3DXFileEnumObjectImpl_GetDataObjectByName + d3dx9_file_enum_object_QueryInterface, + d3dx9_file_enum_object_AddRef, + d3dx9_file_enum_object_Release, + d3dx9_file_enum_object_GetFile, + d3dx9_file_enum_object_GetChildren, + d3dx9_file_enum_object_GetChild, + d3dx9_file_enum_object_GetDataObjectById, + d3dx9_file_enum_object_GetDataObjectByName, }; static HRESULT WINAPI d3dx9_file_QueryInterface(ID3DXFile *iface, REFIID riid, void **out) @@ -542,7 +538,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) { struct d3dx9_file *file = impl_from_ID3DXFile(iface); - ID3DXFileEnumObjectImpl *object; + struct d3dx9_file_enum_object *object; IDirectXFileEnumObject *dxfile_enum_object; void *dxfile_source; DXFILELOADOPTIONS dxfile_options; @@ -592,7 +588,7 @@ static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void * if (!object) return E_OUTOFMEMORY; - object->ID3DXFileEnumObject_iface.lpVtbl = &ID3DXFileEnumObject_Vtbl; + object->ID3DXFileEnumObject_iface.lpVtbl = &d3dx9_file_enum_object_vtbl; object->ref = 1; ret = IDirectXFile_CreateEnumObject(file->dxfile, dxfile_source, dxfile_options, &dxfile_enum_object);

1 0

André Hentschel : winebuild: Update IMAGE_FILE_MACHINE_ARM64.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: e99e9d8d82f91c86377436367a4bd69f4b2ba241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99e9d8d82f91c86377436367… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 25 20:51:10 2013 +0200 winebuild: Update IMAGE_FILE_MACHINE_ARM64. According to pecoff 8.3. --- include/winnt.h | 4 +--- tools/winebuild/spec32.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index be55d9c..a2fcd43 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2460,6 +2460,7 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_ARM 0x01c0 #define IMAGE_FILE_MACHINE_THUMB 0x01c2 #define IMAGE_FILE_MACHINE_ARMNT 0x01c4 +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 #define IMAGE_FILE_MACHINE_AM33 0x01d3 #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 @@ -2476,9 +2477,6 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_M32R 0x9041 #define IMAGE_FILE_MACHINE_CEE 0xc0ee -/* Wine extension */ -#define IMAGE_FILE_MACHINE_ARM64 0x01c5 - #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56 #define IMAGE_SIZEOF_STD_OPTIONAL_HEADER 28 diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ae739d8..0ed38ed 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -37,8 +37,7 @@ #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARMNT 0x01C4 -/* Wine extension */ -#define IMAGE_FILE_MACHINE_ARM64 0x01C5 +#define IMAGE_FILE_MACHINE_ARM64 0xaa64 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240

1 0

Michael Stefaniuc : include: Avoid using CONST in d3dx9math.inl.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 2693d5af710fc14d7568c096659dc0da3c7b164c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2693d5af710fc14d7568c0966… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 26 12:16:24 2013 +0200 include: Avoid using CONST in d3dx9math.inl. --- include/d3dx9math.inl | 244 ++++++++++++++++++++++++------------------------ 1 files changed, 122 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2693d5af710fc14d7568c…

1 0

Michael Stefaniuc : include: Avoid using CONST in d3d8.h.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: df64b0fbe2e8a4a6e284ff07ac493bfaa025a9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df64b0fbe2e8a4a6e284ff07a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 25 23:07:52 2013 +0200 include: Avoid using CONST in d3d8.h. --- include/d3d8.h | 87 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df64b0fbe2e8a4a6e284f…

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXFileImpl typedef.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 177aa5c26fa55acfbe54a5173f6a5568bda3b616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177aa5c26fa55acfbe54a5173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 26 09:31:56 2013 +0200 d3dx9: Get rid of the ID3DXFileImpl typedef. --- dlls/d3dx9_36/xfile.c | 111 +++++++++++++++++++++++-------------------------- 1 files changed, 52 insertions(+), 59 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 9c57277..8c14353 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -46,11 +46,12 @@ static HRESULT error_dxfile_to_d3dxfile(HRESULT error) } } -typedef struct { +struct d3dx9_file +{ ID3DXFile ID3DXFile_iface; LONG ref; IDirectXFile *dxfile; -} ID3DXFileImpl; +}; typedef struct { ID3DXFileEnumObject ID3DXFileEnumObject_iface; @@ -69,9 +70,9 @@ typedef struct { } ID3DXFileDataImpl; -static inline ID3DXFileImpl* impl_from_ID3DXFile(ID3DXFile *iface) +static inline struct d3dx9_file *impl_from_ID3DXFile(ID3DXFile *iface) { - return CONTAINING_RECORD(iface, ID3DXFileImpl, ID3DXFile_iface); + return CONTAINING_RECORD(iface, struct d3dx9_file, ID3DXFile_iface); } static inline ID3DXFileEnumObjectImpl* impl_from_ID3DXFileEnumObject(ID3DXFileEnumObject *iface) @@ -493,60 +494,54 @@ static const ID3DXFileEnumObjectVtbl ID3DXFileEnumObject_Vtbl = ID3DXFileEnumObjectImpl_GetDataObjectByName }; - -/*** IUnknown methods ***/ - -static HRESULT WINAPI ID3DXFileImpl_QueryInterface(ID3DXFile *iface, REFIID riid, void **ret_iface) +static HRESULT WINAPI d3dx9_file_QueryInterface(ID3DXFile *iface, REFIID riid, void **out) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_ID3DXFile)) + if (IsEqualGUID(riid, &IID_ID3DXFile) + || IsEqualGUID(riid, &IID_IUnknown)) { iface->lpVtbl->AddRef(iface); - *ret_iface = iface; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); - *ret_iface = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; } - -static ULONG WINAPI ID3DXFileImpl_AddRef(ID3DXFile *iface) +static ULONG WINAPI d3dx9_file_AddRef(ID3DXFile *iface) { - ID3DXFileImpl *This = impl_from_ID3DXFile(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3dx9_file *file = impl_from_ID3DXFile(iface); + ULONG refcount = InterlockedIncrement(&file->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", file, refcount); - return ref; + return refcount; } - -static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) +static ULONG WINAPI d3dx9_file_Release(ID3DXFile *iface) { - ID3DXFileImpl *This = impl_from_ID3DXFile(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3dx9_file *file = impl_from_ID3DXFile(iface); + ULONG refcount = InterlockedDecrement(&file->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", file, refcount); - if (!ref) + if (!refcount) { - IDirectXFile_Release(This->dxfile); - HeapFree(GetProcessHeap(), 0, This); + IDirectXFile_Release(file->dxfile); + HeapFree(GetProcessHeap(), 0, file); } - return ref; + return refcount; } - -/*** ID3DXFile methods ***/ - -static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const void *source, D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) +static HRESULT WINAPI d3dx9_file_CreateEnumObject(ID3DXFile *iface, const void *source, + D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) { - ID3DXFileImpl *This = impl_from_ID3DXFile(iface); + struct d3dx9_file *file = impl_from_ID3DXFile(iface); ID3DXFileEnumObjectImpl *object; IDirectXFileEnumObject *dxfile_enum_object; void *dxfile_source; @@ -556,7 +551,7 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi IDirectXFileData *data_object; HRESULT ret; - TRACE("(%p)->(%p, %x, %p)\n", iface, source, options, enum_object); + TRACE("iface %p, source %p, options %#x, enum_object %p.\n", iface, source, options, enum_object); if (!enum_object) return E_POINTER; @@ -600,7 +595,7 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi object->ID3DXFileEnumObject_iface.lpVtbl = &ID3DXFileEnumObject_Vtbl; object->ref = 1; - ret = IDirectXFile_CreateEnumObject(This->dxfile, dxfile_source, dxfile_options, &dxfile_enum_object); + ret = IDirectXFile_CreateEnumObject(file->dxfile, dxfile_source, dxfile_options, &dxfile_enum_object); if (ret != S_OK) { @@ -638,23 +633,23 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi return S_OK; } - -static HRESULT WINAPI ID3DXFileImpl_CreateSaveObject(ID3DXFile *iface, const void *data, D3DXF_FILESAVEOPTIONS options, D3DXF_FILEFORMAT format, ID3DXFileSaveObject **save_object) +static HRESULT WINAPI d3dx9_file_CreateSaveObject(ID3DXFile *iface, const void *data, + D3DXF_FILESAVEOPTIONS options, D3DXF_FILEFORMAT format, ID3DXFileSaveObject **save_object) { - FIXME("(%p)->(%p, %x, %u, %p): stub\n", iface, data, options, format, save_object); + FIXME("iface %p, data %p, options %#x, format %#x, save_object %p stub!\n", + iface, data, options, format, save_object); return E_NOTIMPL; } - -static HRESULT WINAPI ID3DXFileImpl_RegisterTemplates(ID3DXFile *iface, const void *data, SIZE_T size) +static HRESULT WINAPI d3dx9_file_RegisterTemplates(ID3DXFile *iface, const void *data, SIZE_T size) { - ID3DXFileImpl *This = impl_from_ID3DXFile(iface); + struct d3dx9_file *file = impl_from_ID3DXFile(iface); HRESULT ret; - TRACE("(%p)->(%p, %lu)\n", iface, data, size); + TRACE("iface %p, data %p, size %lu.\n", iface, data, size); - ret = IDirectXFile_RegisterTemplates(This->dxfile, (void*)data, size); + ret = IDirectXFile_RegisterTemplates(file->dxfile, (void *)data, size); if (ret != DXFILE_OK) { WARN("Error %#x\n", ret); @@ -664,32 +659,30 @@ static HRESULT WINAPI ID3DXFileImpl_RegisterTemplates(ID3DXFile *iface, const vo return S_OK; } - -static HRESULT WINAPI ID3DXFileImpl_RegisterEnumTemplates(ID3DXFile *iface, ID3DXFileEnumObject *enum_object) +static HRESULT WINAPI d3dx9_file_RegisterEnumTemplates(ID3DXFile *iface, ID3DXFileEnumObject *enum_object) { - FIXME("(%p)->(%p): stub\n", iface, enum_object); + FIXME("iface %p, enum_object %p stub!\n", iface, enum_object); return E_NOTIMPL; } - -static const ID3DXFileVtbl ID3DXFile_Vtbl = +static const ID3DXFileVtbl d3dx9_file_vtbl = { - ID3DXFileImpl_QueryInterface, - ID3DXFileImpl_AddRef, - ID3DXFileImpl_Release, - ID3DXFileImpl_CreateEnumObject, - ID3DXFileImpl_CreateSaveObject, - ID3DXFileImpl_RegisterTemplates, - ID3DXFileImpl_RegisterEnumTemplates + d3dx9_file_QueryInterface, + d3dx9_file_AddRef, + d3dx9_file_Release, + d3dx9_file_CreateEnumObject, + d3dx9_file_CreateSaveObject, + d3dx9_file_RegisterTemplates, + d3dx9_file_RegisterEnumTemplates, }; HRESULT WINAPI D3DXFileCreate(ID3DXFile **d3dxfile) { - ID3DXFileImpl *object; + struct d3dx9_file *object; HRESULT ret; - TRACE("(%p)\n", d3dxfile); + TRACE("d3dxfile %p.\n", d3dxfile); if (!d3dxfile) return E_POINTER; @@ -709,7 +702,7 @@ HRESULT WINAPI D3DXFileCreate(ID3DXFile **d3dxfile) return E_FAIL; } - object->ID3DXFile_iface.lpVtbl = &ID3DXFile_Vtbl; + object->ID3DXFile_iface.lpVtbl = &d3dx9_file_vtbl; object->ref = 1; *d3dxfile = &object->ID3DXFile_iface;

1 0

Piotr Caban : msvcrt: Call MSVCRT_strtoi64_l in strtoul implementation.
by Alexandre Julliard Sept. 25, 2013

Sept. 25, 2013

Module: wine Branch: master Commit: a449b2d57b6ad84f11c90346e01b8acef546b4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a449b2d57b6ad84f11c90346e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 25 14:41:52 2013 +0200 msvcrt: Call MSVCRT_strtoi64_l in strtoul implementation. --- dlls/msvcrt/string.c | 47 ++++++++++++++++--------------------------- dlls/msvcrt/tests/string.c | 20 ++++++++++++++++++ 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index cdce4a2..861389b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -726,35 +726,6 @@ int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, return 0; } -/****************************************************************** - * strtoul (MSVCRT.@) - */ -MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) -{ - /* wrapper to forward libc error code to msvcrt's error codes */ - unsigned long ret; - - errno = 0; - ret = strtoul(nptr, end, base); - switch (errno) - { - case ERANGE: *MSVCRT__errno() = MSVCRT_ERANGE; break; - case EINVAL: *MSVCRT__errno() = MSVCRT_EINVAL; break; - default: - /* cope with the fact that we may use 64bit long integers on libc - * while msvcrt always uses 32bit long integers - */ - if (ret > MSVCRT_ULONG_MAX) - { - ret = MSVCRT_ULONG_MAX; - *MSVCRT__errno() = MSVCRT_ERANGE; - } - break; - } - - return ret; -} - /********************************************************************* * strlen (MSVCRT.@) */ @@ -918,6 +889,24 @@ MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) return ret; } +/****************************************************************** + * strtoul (MSVCRT.@) + */ +MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) +{ + __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, NULL); + + if(ret > MSVCRT_ULONG_MAX) { + ret = MSVCRT_ULONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + }else if(ret < -(__int64)MSVCRT_ULONG_MAX) { + ret = 1; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + + return ret; +} + /********************************************************************* * _strtoui64_l (MSVCRT.@) * diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index dc90b38..3877d18 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1341,6 +1341,26 @@ static void test_strtol(void) ul = strtoul("9223372036854775807L", &e, 0); ok(ul==4294967295ul, "wrong value %u\n", ul); ok(errno == ERANGE, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-2", NULL, 0); + ok(ul == -2, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967294", NULL, 0); + ok(ul == 2, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967295", NULL, 0); + ok(ul==1, "wrong value %u\n", ul); + ok(errno == 0, "wrong errno %d\n", errno); + + errno = 0; + ul = strtoul("-4294967296", NULL, 0); + ok(ul == 1, "wrong value %u\n", ul); + ok(errno == ERANGE, "wrong errno %d\n", errno); } static void test_strnlen(void)

1 0