November 2006 - Wine-commits

Jacek Caban : shdoclc: Added shdoclc.dll.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 2d3a5a616f796a5cd2dd42a8f9807ea644a1b5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3a5a616f796a5cd2dd42a8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 23:51:08 2006 +0100 shdoclc: Added shdoclc.dll. --- Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/shdoclc/Bg.rc | 236 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/De.rc | 238 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/En.rc | 236 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Es.rc | 238 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Fi.rc | 238 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Fr.rc | 239 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Hu.rc | 237 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Ko.rc | 237 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Makefile.in | 12 +++ dlls/shdoclc/Nl.rc | 238 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/No.rc | 236 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Sv.rc | 236 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Tr.rc | 236 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/rsrc.rc | 36 +++++++ dlls/shdoclc/shdoclc.h | 36 +++++++ dlls/shdoclc/shdoclc.spec | 1 + 20 files changed, 2936 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d3a5a616f796a5cd2dd4…

1 0

Michael Stefaniuc : winmm/tests: Win64 printf format warning fixes.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 8f0f9371a8452ae04feaa4b228179b9479b3e620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0f9371a8452ae04feaa4b22… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 12 21:06:57 2006 +0100 winmm/tests: Win64 printf format warning fixes. --- dlls/winmm/tests/Makefile.in | 1 - dlls/winmm/tests/capture.c | 32 +++++++++--------- dlls/winmm/tests/mixer.c | 72 +++++++++++++++++++++--------------------- dlls/winmm/tests/mmio.c | 52 +++++++++++++++--------------- dlls/winmm/tests/timer.c | 8 ++-- dlls/winmm/tests/wave.c | 32 +++++++++--------- 6 files changed, 98 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f0f9371a8452ae04feaa…

1 0

Michael Stefaniuc : winmm/tests: Fix the parameters of LPTIMECALLBACK functions.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 60c19952b7173de78f1951b488f93820465ec691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c19952b7173de78f1951b48… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 12 21:06:19 2006 +0100 winmm/tests: Fix the parameters of LPTIMECALLBACK functions. --- dlls/winmm/tests/timer.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/timer.c b/dlls/winmm/tests/timer.c index 4b2ebeb..309c3ce 100644 --- a/dlls/winmm/tests/timer.c +++ b/dlls/winmm/tests/timer.c @@ -68,7 +68,8 @@ #define NUM_SAMPLES 100 static DWORD count = 0; static DWORD times[NUM_SAMPLES]; -static void CALLBACK testTimeProc(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2) +static void CALLBACK testTimeProc(UINT uID, UINT uMsg, DWORD_PTR dwUser, + DWORD_PTR dw1, DWORD_PTR dw2) { if (count < NUM_SAMPLES) times[count++] = timeGetTime(); @@ -162,7 +163,8 @@ #define STR(x) case x: return #x static int priority = 0; static BOOL fired = FALSE; -static void CALLBACK priorityTimeProc(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2) +static void CALLBACK priorityTimeProc(UINT uID, UINT uMsg, DWORD_PTR dwUser, + DWORD_PTR dw1, DWORD_PTR dw2) { priority = GetThreadPriority(GetCurrentThread()); ok(priority!=THREAD_PRIORITY_ERROR_RETURN, "GetThreadPriority() failed, GetLastError() = %08lx\n", GetLastError());

1 0

Michael Stefaniuc : dsound: Win64 printf format warning fixes.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 26bd2ec9c3d651e0679a4263c3366162f4cb04c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26bd2ec9c3d651e0679a4263c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 12 14:40:35 2006 +0100 dsound: Win64 printf format warning fixes. --- dlls/dsound/Makefile.in | 1 - dlls/dsound/buffer.c | 100 ++++++++++++++++++++++---------------------- dlls/dsound/capture.c | 76 +++++++++++++++++----------------- dlls/dsound/dsound.c | 52 ++++++++++++------------ dlls/dsound/dsound_main.c | 6 +- dlls/dsound/duplex.c | 28 ++++++------ dlls/dsound/mixer.c | 92 +++++++++++++++++++++--------------------- dlls/dsound/primary.c | 64 ++++++++++++++-------------- dlls/dsound/propset.c | 70 ++++++++++++++++---------------- dlls/dsound/sound3d.c | 60 +++++++++++++------------- 10 files changed, 274 insertions(+), 275 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26bd2ec9c3d651e0679a4…

1 0

Michael Stefaniuc : dsound: Fix the declaration/definition of DSOUND_timer( ).
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 0f08667c8a7fdf8ff47acc2e23c9d58a77209087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f08667c8a7fdf8ff47acc2e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 12 14:39:11 2006 +0100 dsound: Fix the declaration/definition of DSOUND_timer(). --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index ca4932c..cb14457 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -445,7 +445,7 @@ void DSOUND_WaveQueue(DirectSoundDevice void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan); void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan); void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb); -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2); +void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2); void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2); /* sound3d.c */ diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 92f4914..2f88e46 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -1107,7 +1107,8 @@ #endif } } -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2) +void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, + DWORD_PTR dw1, DWORD_PTR dw2) { DirectSoundDevice * device = (DirectSoundDevice*)dwUser; DWORD start_time = GetTickCount();

1 0

Hans Leidekker : shlwapi: UrlEscapeA should fail with E_POINTER when querying the buffer size.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: bc2e37ba44dd8ac312352c20f3af7380bd99c988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2e37ba44dd8ac312352c20f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Nov 12 16:17:48 2006 +0100 shlwapi: UrlEscapeA should fail with E_POINTER when querying the buffer size. --- dlls/shlwapi/tests/path.c | 6 ++++++ dlls/shlwapi/url.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index f7a2c4a..9746fbc 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -476,7 +476,13 @@ static void test_url_canonicalize(const static void test_UrlEscape(void) { + DWORD size; + HRESULT ret; unsigned int i; + + ret = UrlEscapeA("/woningplan/woonkamer basis.swf", NULL, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); + for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { test_url_escape(TEST_ESCAPE[i].url, TEST_ESCAPE[i].flags, TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].expecturl); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 40dba62..df8a96f 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -838,7 +838,7 @@ HRESULT WINAPI UrlEscapeA( } if(ret == S_OK) { RtlUnicodeToMultiByteSize(&lenA, escapedW, lenW * sizeof(WCHAR)); - if(*pcchEscaped > lenA) { + if(pszEscaped && *pcchEscaped > lenA) { RtlUnicodeToMultiByteN(pszEscaped, *pcchEscaped - 1, &lenA, escapedW, lenW * sizeof(WCHAR)); pszEscaped[lenA] = 0; *pcchEscaped = lenA; @@ -967,8 +967,8 @@ HRESULT WINAPI UrlEscapeW( TRACE("(%s %p %p 0x%08x)\n", debugstr_w(pszUrl), pszEscaped, pcchEscaped, dwFlags); - if(!pszUrl || !pszEscaped || !pcchEscaped) - return E_INVALIDARG; + if(!pszUrl || !pcchEscaped) + return E_INVALIDARG; if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY | URL_ESCAPE_SEGMENT_ONLY |

1 0

Roderick Colenbrander : wgl: Fix a typo in the pbuffer pixelformat enumeration code.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 5b026479c5d43c1a41e626e49d94e140779429e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b026479c5d43c1a41e626e49… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Nov 12 13:08:26 2006 +0100 wgl: Fix a typo in the pbuffer pixelformat enumeration code. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d41beea..70ad9eb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2110,7 +2110,7 @@ static GLboolean WINAPI X11DRV_wglChoose ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); continue; } - gl_test = pglXGetFBConfigAttrib(gdi_display, cfgs[it], GLX_VISUAL_ID, &tmp_vis_id); + gl_test = pglXGetFBConfigAttrib(gdi_display, cfgs_fmt[it_fmt], GLX_VISUAL_ID, &tmp_vis_id); if (gl_test) { ERR("Failed to retrieve VISUAL_ID from GLXFBConfig, expect problems.\n"); continue;

1 0

H. Verbeet : winex11.drv: The y coordinate should be offset agaist the height, not the width.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 22b58908628c87b44ad198abc8d752931252a880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b58908628c87b44ad198abc… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Nov 11 23:08:36 2006 +0100 winex11.drv: The y coordinate should be offset agaist the height, not the width. --- dlls/winex11.drv/bitblt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index a1228d3..ef4ecb7 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1612,7 +1612,7 @@ static BOOL X11DRV_ClientSideDIBCopy( X1 } else { - srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmWidth-ySrc-1)*srcDib.dsBm.bmWidthBytes + srcPtr = &physDevSrc->bitmap->base[(srcDib.dsBm.bmHeight-ySrc-1)*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; srcRowOffset = -srcDib.dsBm.bmWidthBytes; } @@ -1623,7 +1623,7 @@ static BOOL X11DRV_ClientSideDIBCopy( X1 } else { - dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmWidth-yDst-1)*dstDib.dsBm.bmWidthBytes + dstPtr = &physDevDst->bitmap->base[(dstDib.dsBm.bmHeight-yDst-1)*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; dstRowOffset = -dstDib.dsBm.bmWidthBytes; }

1 0

Andrew Talbot : advapi32: Constify a parameter.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: ac28398d12b33b091818c6422a4a950828af3d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac28398d12b33b091818c6422… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 11 16:01:01 2006 +0000 advapi32: Constify a parameter. --- dlls/advapi32/crypt_sha.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/crypt_sha.c b/dlls/advapi32/crypt_sha.c index 435c67e..ffd59a7 100644 --- a/dlls/advapi32/crypt_sha.c +++ b/dlls/advapi32/crypt_sha.c @@ -135,7 +135,7 @@ A_SHAInit(PSHA_CTX Context) * Nothing */ VOID WINAPI -A_SHAUpdate(PSHA_CTX Context, PCHAR Buffer, UINT BufferSize) +A_SHAUpdate(PSHA_CTX Context, const unsigned char *Buffer, UINT BufferSize) { ULONG BufferContentSize; @@ -199,7 +199,7 @@ A_SHAFinal(PSHA_CTX Context, PULONG Resu Count = (ULONG*)(Buffer + Pad); Count[0] = DWORD2BE(LengthHi); Count[1] = DWORD2BE(LengthLo); - A_SHAUpdate(Context, (PCHAR)Buffer, Pad + 8); + A_SHAUpdate(Context, Buffer, Pad + 8); for (Index = 0; Index < 5; Index++) Result[Index] = DWORD2BE(Context->State[Index]);

1 0

Andrew Talbot : rpcrt4: Cast-qual warnings fix.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: fcb5bc6a1fe15189dec640262077e0074e2238d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb5bc6a1fe15189dec640262… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 11 14:57:53 2006 +0000 rpcrt4: Cast-qual warnings fix. --- dlls/rpcrt4/ndr_stubless.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index a6f1ec6..949923c 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -812,7 +812,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { /* object is always the first argument */ - This = **(void ***)(&pFormat+1); + This = **(void *const **)(&pFormat+1); NdrProxyInitialize(This, &rpcMsg, &stubMsg, pStubDesc, procedure_number); } else

1 0