October 2006 - Wine-commits

Michael Stefaniuc : mpr: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: b46d30e523b2504fd1c20d30e1e341b8e6bb64b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46d30e523b2504fd1c20d30e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 12 21:34:20 2006 +0200 mpr: Win64 printf format warning fixes. --- dlls/mpr/Makefile.in | 1 - dlls/mpr/multinet.c | 5 +-- dlls/mpr/nps.c | 16 +++++----- dlls/mpr/pwcache.c | 2 + dlls/mpr/wnet.c | 80 +++++++++++++++++++++++++------------------------- 5 files changed, 51 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b46d30e523b2504fd1c20…

1 0

Hans Leidekker : mapi32/tests: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 577d1e1f89274990e125d5269f94bbfaf30c010e URL: http://source.winehq.org/git/wine.git/?a=commit;h=577d1e1f89274990e125d5269… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 12 20:56:25 2006 +0200 mapi32/tests: Win64 printf format warning fixes. --- dlls/mapi32/tests/Makefile.in | 1 dlls/mapi32/tests/imalloc.c | 8 ++- dlls/mapi32/tests/prop.c | 108 +++++++++++++++++++++-------------------- dlls/mapi32/tests/util.c | 8 ++- 4 files changed, 62 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=577d1e1f89274990e125d…

1 0

Hans Leidekker : itss: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 2492abbbd38ea668998429a2ba6d29353ac83e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2492abbbd38ea668998429a2b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 12 20:56:50 2006 +0200 itss: Win64 printf format warning fixes. --- dlls/itss/Makefile.in | 2 +- dlls/itss/chm_lib.c | 32 ++++++++++++++++---------------- dlls/itss/itss.c | 6 +++--- dlls/itss/storage.c | 16 ++++++++-------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 12295aa..76e9cac 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = itss.dll IMPORTS = ole32 user32 advapi32 kernel32 ntdll EXTRALIBS = -luuid -EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT +EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ chm_lib.c \ diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 8e3a75e..33420e5 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -99,7 +99,7 @@ typedef ULONGLONG UInt64; /* utilities for unmarshalling data */ static int _unmarshal_char_array(unsigned char **pData, - unsigned long *pLenRemain, + unsigned int *pLenRemain, char *dest, int count) { @@ -112,7 +112,7 @@ static int _unmarshal_char_array(unsigne } static int _unmarshal_uchar_array(unsigned char **pData, - unsigned long *pLenRemain, + unsigned int *pLenRemain, unsigned char *dest, int count) { @@ -125,7 +125,7 @@ static int _unmarshal_uchar_array(unsign } static int _unmarshal_int32(unsigned char **pData, - unsigned long *pLenRemain, + unsigned int *pLenRemain, Int32 *dest) { if (4 > *pLenRemain) @@ -137,7 +137,7 @@ static int _unmarshal_int32(unsigned cha } static int _unmarshal_uint32(unsigned char **pData, - unsigned long *pLenRemain, + unsigned int *pLenRemain, UInt32 *dest) { if (4 > *pLenRemain) @@ -149,7 +149,7 @@ static int _unmarshal_uint32(unsigned ch } static int _unmarshal_int64(unsigned char **pData, - unsigned long *pLenRemain, + unsigned int *pLenRemain, Int64 *dest) { Int64 temp; @@ -169,7 +169,7 @@ static int _unmarshal_int64(unsigned cha } static int _unmarshal_uint64(unsigned char **pData, - unsigned long *pLenRemain, + unsigned int *pLenRemain, UInt64 *dest) { UInt64 temp; @@ -189,7 +189,7 @@ static int _unmarshal_uint64(unsigned ch } static int _unmarshal_uuid(unsigned char **pData, - unsigned long *pDataLen, + unsigned int *pDataLen, unsigned char *dest) { return _unmarshal_uchar_array(pData, pDataLen, dest, 16); @@ -251,7 +251,7 @@ struct chmItsfHeader }; /* __attribute__ ((aligned (1))); */ static int _unmarshal_itsf_header(unsigned char **pData, - unsigned long *pDataLen, + unsigned int *pDataLen, struct chmItsfHeader *dest) { /* we only know how to deal with the 0x58 and 0x60 byte structures */ @@ -329,7 +329,7 @@ struct chmItspHeader }; /* __attribute__ ((aligned (1))); */ static int _unmarshal_itsp_header(unsigned char **pData, - unsigned long *pDataLen, + unsigned int *pDataLen, struct chmItspHeader *dest) { /* we only know how to deal with a 0x54 byte structures */ @@ -377,7 +377,7 @@ struct chmPmglHeader }; /* __attribute__ ((aligned (1))); */ static int _unmarshal_pmgl_header(unsigned char **pData, - unsigned long *pDataLen, + unsigned int *pDataLen, struct chmPmglHeader *dest) { /* we only know how to deal with a 0x14 byte structures */ @@ -408,7 +408,7 @@ struct chmPmgiHeader }; /* __attribute__ ((aligned (1))); */ static int _unmarshal_pmgi_header(unsigned char **pData, - unsigned long *pDataLen, + unsigned int *pDataLen, struct chmPmgiHeader *dest) { /* we only know how to deal with a 0x8 byte structures */ @@ -440,7 +440,7 @@ struct chmLzxcResetTable }; /* __attribute__ ((aligned (1))); */ static int _unmarshal_lzxc_reset_table(unsigned char **pData, - unsigned long *pDataLen, + unsigned int *pDataLen, struct chmLzxcResetTable *dest) { /* we only know how to deal with a 0x28 byte structures */ @@ -478,7 +478,7 @@ struct chmLzxcControlData }; static int _unmarshal_lzxc_control_data(unsigned char **pData, - unsigned long *pDataLen, + unsigned int *pDataLen, struct chmLzxcControlData *dest) { /* we want at least 0x18 bytes */ @@ -603,7 +603,7 @@ static Int64 _chm_fetch_bytes(struct chm struct chmFile *chm_openW(const WCHAR *filename) { unsigned char sbuffer[256]; - unsigned long sremain; + unsigned int sremain; unsigned char *sbufpos; struct chmFile *newHandle=NULL; struct chmItsfHeader itsfHeader; @@ -1401,7 +1401,7 @@ int chm_enumerate(struct chmFile *h, struct chmPmglHeader header; UChar *end; UChar *cur; - unsigned long lenRemain; + unsigned int lenRemain; UInt64 ui_path_len; /* the current ui */ @@ -1514,7 +1514,7 @@ int chm_enumerate_dir(struct chmFile *h, struct chmPmglHeader header; UChar *end; UChar *cur; - unsigned long lenRemain; + unsigned int lenRemain; /* set to 1 once we've started */ int it_has_begun=0; diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 6bc312e..1448632 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -222,7 +222,7 @@ static HRESULT WINAPI ITStorageImpl_StgC { ITStorageImpl *This = (ITStorageImpl *)iface; - TRACE("%p %s %lu %lu %p\n", This, + TRACE("%p %s %u %u %p\n", This, debugstr_w(pwcsName), grfMode, reserved, ppstgOpen ); return ITSS_StgOpenStorage( pwcsName, NULL, grfMode, @@ -270,7 +270,7 @@ static HRESULT WINAPI ITStorageImpl_StgO { ITStorageImpl *This = (ITStorageImpl *)iface; - TRACE("%p %s %p %ld %p\n", This, debugstr_w( pwcsName ), + TRACE("%p %s %p %d %p\n", This, debugstr_w( pwcsName ), pstgPriority, grfMode, snbExclude ); return ITSS_StgOpenStorage( pwcsName, pstgPriority, grfMode, @@ -370,6 +370,6 @@ static HRESULT ITSS_create(IUnknown *pUn HRESULT WINAPI DllCanUnloadNow(void) { - TRACE("dll_count = %lu\n", dll_count); + TRACE("dll_count = %u\n", dll_count); return dll_count ? S_FALSE : S_OK; } diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index b10e9a0..1275808 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -144,7 +144,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_ DWORD len, n; struct enum_info *cur; - TRACE("%p %lu %p %p\n", This, celt, rgelt, pceltFetched ); + TRACE("%p %u %p %p\n", This, celt, rgelt, pceltFetched ); cur = This->current; n = 0; @@ -196,7 +196,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_ DWORD n; struct enum_info *cur; - TRACE("%p %lu\n", This, celt ); + TRACE("%p %u\n", This, celt ); cur = This->current; n = 0; @@ -332,7 +332,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_ int r; WCHAR *path; - TRACE("%p %s %p %lu %lu %p\n", This, debugstr_w(pwcsName), + TRACE("%p %s %p %u %u %p\n", This, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm ); len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; @@ -386,7 +386,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_ { ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; - FIXME("%p %s %p %lu %p %lu %p\n", This, debugstr_w(pwcsName), + FIXME("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName), pstgPriority, grfMode, snbExclude, reserved, ppstg); return E_NOTIMPL; } @@ -462,7 +462,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_ ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; IEnumSTATSTG_Impl* stgenum; - TRACE("%p %ld %p %ld %p\n", This, reserved1, reserved2, reserved3, ppenum ); + TRACE("%p %d %p %d %p\n", This, reserved1, reserved2, reserved3, ppenum ); stgenum = ITSS_create_enum(); if( !stgenum ) @@ -654,7 +654,7 @@ static HRESULT WINAPI ITSS_IStream_Read( IStream_Impl *This = (IStream_Impl *)iface; ULONG count; - TRACE("%p %p %lu %p\n", This, pv, cb, pcbRead); + TRACE("%p %p %u %p\n", This, pv, cb, pcbRead); count = chm_retrieve_object(This->stg->chmfile, &This->ui, pv, This->addr, cb); @@ -684,7 +684,7 @@ static HRESULT WINAPI ITSS_IStream_Seek( IStream_Impl *This = (IStream_Impl *)iface; LONGLONG newpos; - TRACE("%p %s %lu %p\n", This, + TRACE("%p %s %u %p\n", This, wine_dbgstr_longlong( dlibMove.QuadPart ), dwOrigin, plibNewPosition ); newpos = This->addr; @@ -772,7 +772,7 @@ static HRESULT WINAPI ITSS_IStream_Stat( { IStream_Impl *This = (IStream_Impl *)iface; - TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag); + TRACE("%p %p %d\n", This, pstatstg, grfStatFlag); memset( pstatstg, 0, sizeof *pstatstg ); if( !( grfStatFlag & STATFLAG_NONAME ) )

1 0

Hans Leidekker : tapi32: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 0a1f1a9c00d598973654d6184bdb13b36642ceac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1f1a9c00d598973654d6184… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 12 20:56:37 2006 +0200 tapi32: Win64 printf format warning fixes. --- dlls/tapi32/Makefile.in | 1 dlls/tapi32/assisted.c | 4 +- dlls/tapi32/line.c | 124 ++++++++++++++++++++++++----------------------- dlls/tapi32/phone.c | 36 +++++++------- 4 files changed, 82 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a1f1a9c00d598973654d…

1 0

Hans Leidekker : netapi32: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 9f71ae876a8fc2f1e5204072158ac21b8527f93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f71ae876a8fc2f1e52040721… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 12 20:56:59 2006 +0200 netapi32: Win64 printf format warning fixes. --- dlls/netapi32/Makefile.in | 2 +- dlls/netapi32/access.c | 34 +++++++++++++++++----------------- dlls/netapi32/apibuf.c | 6 +++--- dlls/netapi32/ds.c | 6 +++--- dlls/netapi32/local_group.c | 16 ++++++++-------- dlls/netapi32/nbt.c | 2 +- dlls/netapi32/netapi32.c | 10 +++++----- dlls/netapi32/netbios.c | 10 +++++----- dlls/netapi32/share.c | 4 ++-- dlls/netapi32/wksta.c | 14 +++++++------- 10 files changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f71ae876a8fc2f1e5204…

1 0

Hans Leidekker : oleaut32/tests: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 279207b2582d31db1598ccc05e7e2cf021e3504d URL: http://source.winehq.org/git/wine.git/?a=commit;h=279207b2582d31db1598ccc05… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 12 13:56:01 2006 +0200 oleaut32/tests: Win64 printf format warning fixes. --- dlls/oleaut32/tests/Makefile.in | 1 dlls/oleaut32/tests/olefont.c | 110 ++++++------ dlls/oleaut32/tests/olepicture.c | 66 ++++--- dlls/oleaut32/tests/safearray.c | 294 +++++++++++++++++---------------- dlls/oleaut32/tests/typelib.c | 42 ++--- dlls/oleaut32/tests/usrmarshal.c | 102 ++++++------ dlls/oleaut32/tests/varformat.c | 14 +- dlls/oleaut32/tests/vartest.c | 336 +++++++++++++++++++------------------- dlls/oleaut32/tests/vartype.c | 202 +++++++++++------------ 9 files changed, 583 insertions(+), 584 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=279207b2582d31db1598c…

1 0

Detlef Riekenberg : shell32: Implement SHRegQueryValueA with RegQueryValueA .
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 449dfadf51601ef504e3808676e57cb2918a3958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=449dfadf51601ef504e380867… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 12 19:41:53 2006 +0200 shell32: Implement SHRegQueryValueA with RegQueryValueA. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellreg.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index debb9a4..562db74 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -215,7 +215,7 @@ #300 stub Shl3216_ThunkData32 505 stdcall SHRegCloseKey (long) 506 stdcall SHRegOpenKeyA (long str long) 507 stdcall SHRegOpenKeyW (long wstr long) - 508 stub SHRegQueryValueA + 508 stdcall SHRegQueryValueA(long str ptr ptr) 509 stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) 510 stdcall SHRegQueryValueW (long long long long) 511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 5db5ccd..a305c8b 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -68,6 +68,16 @@ HRESULT WINAPI SHRegOpenKeyW ( } /************************************************************************* + * SHRegQueryValueA [SHELL32.508] + * + */ +HRESULT WINAPI SHRegQueryValueA(HKEY hkey, LPSTR lpSubKey, LPSTR lpValue, LPDWORD lpcbValue) +{ + TRACE("(%p %s %p %p)\n", hkey, debugstr_a(lpSubKey), lpValue, lpcbValue); + return RegQueryValueA(hkey, lpSubKey, lpValue, (LONG*)lpcbValue); +} + +/************************************************************************* * SHRegQueryValueExA [SHELL32.509] * */

1 0

Roderick Colenbrander : opengl: Fix wglMakeCurrent bug.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: b77ac326a6bd2c4e508b354dde1fdbc010a1c066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77ac326a6bd2c4e508b354dd… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 7 20:08:26 2006 +0200 opengl: Fix wglMakeCurrent bug. --- dlls/gdi/opengl.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/opengl.c b/dlls/gdi/opengl.c index 25ca345..520d28b 100644 --- a/dlls/gdi/opengl.c +++ b/dlls/gdi/opengl.c @@ -37,6 +37,22 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); +static HDC default_hdc = 0; + +/* We route all wgl functions from opengl32.dll through gdi32.dll to + * the display driver. Various wgl calls have a hDC as one of their parameters. + * Using DC_GetDCPtr we get access to the functions exported by the driver. + * Some functions don't receive a hDC. This function creates a global hdc and + * if there's already a global hdc, it returns it. + */ +static DC* OPENGL_GetDefaultDC() +{ + if(!default_hdc) + default_hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + + return DC_GetDCPtr(default_hdc); +} + /*********************************************************************** * wglCreateContext (OPENGL32.@) */ @@ -62,7 +78,14 @@ HGLRC WINAPI wglCreateContext(HDC hdc) BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) { BOOL ret = FALSE; - DC * dc = DC_GetDCPtr( hdc ); + DC * dc = NULL; + + /* When the context hglrc is NULL, the HDC is ignored and can be NULL. + * In that case use the global hDC to get access to the driver. */ + if(hglrc == NULL) + dc = OPENGL_GetDefaultDC(); + else + dc = DC_GetDCPtr( hdc ); TRACE("hdc: (%p), hglrc: (%p)\n", hdc, hglrc); @@ -71,7 +94,11 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLR if (!dc->funcs->pwglMakeCurrent) FIXME(" :stub\n"); else ret = dc->funcs->pwglMakeCurrent(dc->physDev,hglrc); - GDI_ReleaseObj( hdc); + if(hglrc == NULL) + GDI_ReleaseObj(default_hdc); + else + GDI_ReleaseObj(hdc); + return ret; }

1 0

Srivatsa Kanchi, R : wineprefixcreate: Set correct LD_LIBRARY_PATH.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: ff82ce24247e90fcc6cd7602c83f2a74301d3fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff82ce24247e90fcc6cd7602c… Author: Srivatsa Kanchi, R <skanchi(a)nexthop.com> Date: Wed Oct 11 15:09:13 2006 +0530 wineprefixcreate: Set correct LD_LIBRARY_PATH. --- tools/wineprefixcreate.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 7ac5c8c..d5d76dd 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -74,9 +74,9 @@ then WINESERVER="$topdir/server/wineserver" if [ -n "$LD_LIBRARY_PATH" ] then - LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$topdir/libs/wine:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$topdir/libs" + LD_LIBRARY_PATH="$topdir/libs/wine" fi export LD_LIBRARY_PATH

1 0

Hans Leidekker : mscms/tests: Win64 printf format warning fixes.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 55e3ecf67586a71f50176187adceff0a69d572db URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e3ecf67586a71f50176187a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Oct 12 14:05:25 2006 +0200 mscms/tests: Win64 printf format warning fixes. --- dlls/mscms/tests/Makefile.in | 1 dlls/mscms/tests/profile.c | 306 +++++++++++++++++++++--------------------- 2 files changed, 153 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55e3ecf67586a71f50176…

1 0