September 2006 - Wine-Commits

Saulius Krasuckas : lz32/tests: Move indirect opening of compressed files into separate functions.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: a7129faf193989a30ed3d724fee6222140e8e361 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7129faf193989a30ed3d72… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Mon Sep 25 21:00:39 2006 +0300 lz32/tests: Move indirect opening of compressed files into separate functions. Also rename W-string variable to get some naming consistency. --- dlls/lz32/tests/lzexpand_main.c | 201 +++++++++++++++++++++++++++------------ 1 files changed, 138 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a7129faf193989a30ed…

1 0

Saulius Krasuckas : lz32/tests: Compare result to predefined compressed file name, not calculated one.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: f916b78603f3c5c3962df96b9c3667cfc7b8ae03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f916b78603f3c5c3962df96… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Mon Sep 25 20:59:23 2006 +0300 lz32/tests: Compare result to predefined compressed file name, not calculated one. --- dlls/lz32/tests/lzexpand_main.c | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index fe1ae83..d8845a6 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -27,8 +27,9 @@ #include <lzexpand.h> #include "wine/test.h" +/* Compressed file names end with underscore. */ +static char filename [] = "testfile.xxx"; static char filename_[] = "testfile.xx_"; -static char filename[] = "testfile.xxx"; static char filename2[] = "testfile.yyy"; static WCHAR filename_W[] = {'t','e','s','t','f','i','l','e','.','x','x','_',0}; @@ -55,6 +56,17 @@ static const DWORD uncompressed_data_siz static char *buf; +static void full_file_path_name_in_a_CWD(const char *src, char *dst) +{ + DWORD retval; + + retval = GetCurrentDirectoryA(MAX_PATH, dst); + ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=0x%lx\n", + retval, GetLastError()); + lstrcatA(dst, "\\"); + lstrcatA(dst, src); +} + static void test_LZOpenFileA(void) { OFSTRUCT test; @@ -99,14 +111,7 @@ static void test_LZOpenFileA(void) check for the file "foo.xx_" and open that -- at least on some operating systems. Doesn't seem to on my copy of Win98. */ - retval = GetCurrentDirectoryA(MAX_PATH, expected); - ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=0x%lx\n", - retval, GetLastError()); - lstrcatA(expected, "\\"); - lstrcatA(expected, filename); - /* Compressed file name ends with underscore. */ - retval = lstrlenA(expected); - expected[retval-1] = '_'; + full_file_path_name_in_a_CWD(filename_, expected); memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); memset(&test, 0xA5, sizeof(test)); @@ -271,15 +276,7 @@ static void test_LZOpenFileW(void) check for the file "foo.xx_" and open that -- at least on some operating systems. Doesn't seem to on my copy of Win98. */ - retval = GetCurrentDirectoryA(MAX_PATH, expected); - ok(retval > 0, "GetCurrentDirectoryW returned %ld, GLE=0x%lx\n", - retval, GetLastError()); - lstrcatA(expected, "\\"); - /* It's probably better to use WideCharToMultiByte() on filenameW: */ - lstrcatA(expected, filename); - /* Compressed file name ends with underscore. */ - retval = lstrlenA(expected); - expected[retval-1] = '_'; + full_file_path_name_in_a_CWD(filename_, expected); memset(&test, 0xA5, sizeof(test)); /* Try to open compressed file. */

1 0

Juan Lang : crypt32: Reduce indent level of tests.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 09765f7db4f8b7f4b2a57a75607c2b851e00c40d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=09765f7db4f8b7f4b2a57a7… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Sep 25 20:24:44 2006 -0700 crypt32: Reduce indent level of tests. --- dlls/crypt32/tests/cert.c | 919 ++++++++++++++++++++++----------------------- 1 files changed, 457 insertions(+), 462 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=09765f7db4f8b7f4b2a…

1 0

Roderick Colenbrander : winex11.Drv: Remove unneeded wgl exports.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 272196f5140deacefb8eb072542ed88ba72f1612 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=272196f5140deacefb8eb07… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Sep 25 23:03:27 2006 +0200 winex11.Drv: Remove unneeded wgl exports. --- dlls/opengl32/wgl.c | 22 ---------------------- dlls/winex11.drv/opengl.c | 18 ++---------------- dlls/winex11.drv/winex11.drv.spec | 2 -- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 7e584a9..bb66430 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -51,10 +51,8 @@ typedef struct wine_wgl_s { BOOL WINAPI (*p_wglDeleteContext)(HGLRC hglrc); HGLRC WINAPI (*p_wglGetCurrentContext)(void); HDC WINAPI (*p_wglGetCurrentDC)(void); - HDC WINAPI (*p_wglGetCurrentReadDCARB)(void); PROC WINAPI (*p_wglGetProcAddress)(LPCSTR lpszProc); BOOL WINAPI (*p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); - BOOL WINAPI (*p_wglMakeContextCurrentARB)(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); BOOL WINAPI (*p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); BOOL WINAPI (*p_wglUseFontBitmapsA)(HDC hdc, DWORD first, DWORD count, DWORD listBase); BOOL WINAPI (*p_wglUseFontBitmapsW)(HDC hdc, DWORD first, DWORD count, DWORD listBase); @@ -298,24 +296,6 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLR } /*********************************************************************** - * wglMakeContextCurrentARB (OPENGL32.@) - */ -BOOL WINAPI wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) -{ - TRACE("hDrawDC: (%p), hReadDC: (%p), hglrc: (%p)\n", hDrawDC, hReadDC, hglrc); - return wine_wgl.p_wglMakeContextCurrentARB(hDrawDC, hReadDC, hglrc); -} - -/*********************************************************************** - * wglGetCurrentReadDCARB (OPENGL32.@) - */ -HDC WINAPI wglGetCurrentReadDCARB(void) -{ - TRACE("\n"); - return wine_wgl.p_wglGetCurrentReadDCARB(); -} - -/*********************************************************************** * wglRealizeLayerPalette (OPENGL32.@) */ BOOL WINAPI wglRealizeLayerPalette(HDC hdc, @@ -718,10 +698,8 @@ static BOOL process_attach(void) wine_wgl.p_wglDeleteContext = (void *)GetProcAddress(mod, "wglDeleteContext"); wine_wgl.p_wglGetCurrentContext = (void *)GetProcAddress(mod, "wglGetCurrentContext"); wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod, "wglGetCurrentDC"); - wine_wgl.p_wglGetCurrentReadDCARB = (void *)GetProcAddress(mod, "wglGetCurrentReadDCARB"); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod, "wglGetProcAddress"); wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod, "wglMakeCurrent"); - wine_wgl.p_wglMakeContextCurrentARB = (void *)GetProcAddress(mod, "wglMakeContextCurrentARB"); wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod, "wglShareLists"); wine_wgl.p_wglUseFontBitmapsA = (void*)GetProcAddress(mod, "wglUseFontBitmapsA"); wine_wgl.p_wglUseFontBitmapsW = (void*)GetProcAddress(mod, "wglUseFontBitmapsW"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1d5b50d..b90f760 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1320,7 +1320,7 @@ HDC WINAPI X11DRV_wglGetCurrentDC(void) } /* OpenGL32 wglGetCurrentReadDCARB */ -HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) +static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) { GLXDrawable gl_d; HDC ret; @@ -1417,7 +1417,7 @@ BOOL WINAPI X11DRV_wglMakeCurrent(HDC hd } /* OpenGL32 wglMakeContextCurrentARB */ -BOOL WINAPI X11DRV_wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) +static BOOL WINAPI X11DRV_wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) { BOOL ret; TRACE("(%p,%p,%p)\n", hDrawDC, hReadDC, hglrc); @@ -2816,13 +2816,6 @@ HDC WINAPI X11DRV_wglGetCurrentDC(void) return 0; } -/* OpenGL32 wglGetCurrentReadDCARB */ -HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) -{ - ERR_(opengl)("No OpenGL support compiled in.\n"); - return 0; -} - /* OpenGL32: wglGetProcAddress */ PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc) { ERR_(opengl)("No OpenGL support compiled in.\n"); @@ -2835,13 +2828,6 @@ BOOL WINAPI X11DRV_wglMakeCurrent(HDC hd return FALSE; } -/* OpenGL32 wglMakeContextCurrentARB */ -BOOL WINAPI X11DRV_wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc) -{ - ERR_(opengl)("No OpenGL support compiled in.\n"); - return FALSE; -} - /* OpenGL32 wglShaderLists */ BOOL WINAPI X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { ERR_(opengl)("No OpenGL support compiled in.\n"); diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index d01316b..4e4dcbf 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -133,10 +133,8 @@ # OpenGL @ cdecl wglDeleteContext(long) X11DRV_wglDeleteContext @ cdecl wglGetCurrentContext() X11DRV_wglGetCurrentContext @ cdecl wglGetCurrentDC() X11DRV_wglGetCurrentDC -@ cdecl wglGetCurrentReadDCARB() X11DRV_wglGetCurrentReadDCARB @ cdecl wglGetIntegerv(long ptr) X11DRV_wglGetIntegerv @ cdecl wglGetProcAddress(ptr) X11DRV_wglGetProcAddress -@ cdecl wglMakeContextCurrentARB(long long long) X11DRV_wglMakeContextCurrentARB @ cdecl wglMakeCurrent(long long) X11DRV_wglMakeCurrent @ cdecl wglShareLists(long long) X11DRV_wglShareLists @ cdecl wglUseFontBitmapsA(long long long long) X11DRV_wglUseFontBitmapsA

1 0

Stefan Dösinger : wined3d: Use GL_EXTCALL.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 581c24ef4e2ba370583ae4989034a4f1b42ae0fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=581c24ef4e2ba370583ae49… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 26 00:13:55 2006 +0200 wined3d: Use GL_EXTCALL. That fixes compilation with gl headers that do not know about glUniform4fvARB. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0554392..0e48cdb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -319,7 +319,7 @@ void shader_glsl_load_constants( /* Upload the position fixup params */ pos = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); checkGLcall("glGetUniformLocationARB"); - glUniform4fvARB(pos, 1, &vshader_impl->wineD3DDevice->posFixup[0]); + GL_EXTCALL(glUniform4fvARB(pos, 1, &vshader_impl->wineD3DDevice->posFixup[0])); checkGLcall("glUniform4fvARB"); }

1 0

Duane Clark : msvcrt: fgetc needs to use unsigned parameters.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 9a71b483d38b0d4287fe157dbfb2ef8020185588 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a71b483d38b0d4287fe157… Author: Duane Clark <fpga(a)pacbell.net> Date: Mon Sep 25 14:28:22 2006 -0700 msvcrt: fgetc needs to use unsigned parameters. Spotted by and adapted from test written by Tobias Ringström. --- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/tests/file.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d65f0d3..9f8f1ba 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2127,12 +2127,12 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* fi */ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) { - char *i; - int j; + unsigned char *i; + unsigned int j; do { if (file->_cnt>0) { file->_cnt--; - i = file->_ptr++; + i = (unsigned char *)file->_ptr++; j = *i; } else j = MSVCRT__filbuf(file); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 470a9e9..fad6ff5 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -255,6 +255,24 @@ static WCHAR* AtoW( char* p ) return buffer; } +static void test_fgetc( void ) +{ + char* tempf; + FILE *tempfh; + int ich=0xe0, ret; + + tempf=_tempnam(".","wne"); + tempfh = fopen(tempf,"w+"); + fputc(ich, tempfh); + fputc(ich, tempfh); + rewind(tempfh); + ret = fgetc(tempfh); + ok(ich == ret, "First fgetc expected %x got %x\n", ich, ret); + ret = fgetc(tempfh); + ok(ich == ret, "Second fgetc expected %x got %x\n", ich, ret); + fclose(tempfh); +} + static void test_fgetwc( void ) { #define LLEN 512 @@ -773,6 +791,7 @@ START_TEST(file) test_fileops(); test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ + test_fgetc(); test_fgetwc(); test_ctrlz(); test_file_put_get();

1 0

Stefan Leichter : dmcompos: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 7a61a617b36ec76d9e1e22721100cf92b2f18133 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a61a617b36ec76d9e1e227… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Sep 25 23:12:30 2006 +0200 dmcompos: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dmcompos/chordmaptrack.c | 9 ++++++--- dlls/dmcompos/dmcompos_main.c | 3 ++- dlls/dmcompos/signposttrack.c | 9 ++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 88b0724..2d478be 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -167,19 +167,22 @@ static HRESULT WINAPI IDirectMusicChordM static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface); - FIXME("(%p, %p, %lli, %lli, %lli, %ld, %p, %p, %ld): stub\n", This, pStateData, rtStart, rtEnd, rtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface); - FIXME("(%p, %s, %lli, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), rtTime, prtNext, pParam, pStateData, dwFlags); + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, TrackVtbl, iface); - FIXME("(%p, %s, %lli, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), rtTime, pParam, pStateData, dwFlags); + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 76541d9..04bdb90 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -740,7 +740,8 @@ const char *debugstr_DMUS_OBJECTDESC (LP if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = %lli\n - pbMemData = %p\n", pDesc->llMemLength, pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); return wine_dbg_sprintf("%s", buffer); diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 0333a8c..dc2646f 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -164,19 +164,22 @@ static HRESULT WINAPI IDirectMusicSignPo static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface); - FIXME("(%p, %p, %lli, %lli, %lli, %ld, %p, %p, %ld): stub\n", This, pStateData, rtStart, rtEnd, rtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface); - FIXME("(%p, %s, %lli, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), rtTime, prtNext, pParam, pStateData, dwFlags); + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, TrackVtbl, iface); - FIXME("(%p, %s, %lli, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), rtTime, pParam, pStateData, dwFlags); + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; }

1 0

Andrew Talbot : rpcrt4: Cast-qual warnings fix.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 8221beb2254dcce7f102a86a7eed0b56af0428e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8221beb2254dcce7f102a86… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Sep 25 21:26:52 2006 +0100 rpcrt4: Cast-qual warnings fix. --- dlls/rpcrt4/rpc_transport.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4249d2a..27b0d84 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -899,8 +899,8 @@ RPC_STATUS RpcTransport_ParseTopOfTower( char **networkaddr, char **endpoint) { - twr_empty_floor_t *protocol_floor; - twr_empty_floor_t *floor4; + const twr_empty_floor_t *protocol_floor; + const twr_empty_floor_t *floor4; const struct protseq_ops *protseq_ops = NULL; RPC_STATUS status; int i; @@ -908,7 +908,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower( if (tower_size < sizeof(*protocol_floor)) return EPT_S_NOT_REGISTERED; - protocol_floor = (twr_empty_floor_t *)tower_data; + protocol_floor = (const twr_empty_floor_t *)tower_data; tower_data += sizeof(*protocol_floor); tower_size -= sizeof(*protocol_floor); if ((protocol_floor->count_lhs != sizeof(protocol_floor->protid)) || @@ -917,7 +917,7 @@ RPC_STATUS RpcTransport_ParseTopOfTower( tower_data += protocol_floor->count_rhs; tower_size -= protocol_floor->count_rhs; - floor4 = (twr_empty_floor_t *)tower_data; + floor4 = (const twr_empty_floor_t *)tower_data; if ((tower_size < sizeof(*floor4)) || (floor4->count_lhs != sizeof(floor4->protid))) return EPT_S_NOT_REGISTERED;

1 0

Andrew Talbot : rpcrt4: Cast-qual warnings fix.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 3f123e51bfa350437f7dc52e0762a397227172c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f123e51bfa350437f7dc52… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Sep 25 21:25:45 2006 +0100 rpcrt4: Cast-qual warnings fix. --- dlls/rpcrt4/ndr_stubless.c | 62 ++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index c6c22d8..9d4d78a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -389,7 +389,7 @@ static PFORMAT_STRING client_get_handle( { case RPC_FC_BIND_PRIMITIVE: /* explicit primitive */ { - NDR_EHD_PRIMITIVE * pDesc = (NDR_EHD_PRIMITIVE *)pFormat; + const NDR_EHD_PRIMITIVE *pDesc = (const NDR_EHD_PRIMITIVE *)pFormat; TRACE("Explicit primitive handle @ %d\n", pDesc->offset); @@ -401,7 +401,7 @@ static PFORMAT_STRING client_get_handle( } case RPC_FC_BIND_GENERIC: /* explicit generic */ { - NDR_EHD_GENERIC * pDesc = (NDR_EHD_GENERIC *)pFormat; + const NDR_EHD_GENERIC *pDesc = (const NDR_EHD_GENERIC *)pFormat; void *pObject = NULL; void *pArg; const GENERIC_BINDING_ROUTINE_PAIR *pGenPair; @@ -419,7 +419,7 @@ static PFORMAT_STRING client_get_handle( } case RPC_FC_BIND_CONTEXT: /* explicit context */ { - NDR_EHD_CONTEXT * pDesc = (NDR_EHD_CONTEXT *)pFormat; + const NDR_EHD_CONTEXT *pDesc = (const NDR_EHD_CONTEXT *)pFormat; NDR_CCONTEXT context_handle; TRACE("Explicit bind context\n"); if (pDesc->flags & HANDLE_PARAM_IS_VIA_PTR) @@ -484,7 +484,7 @@ static void client_free_handle( { case RPC_FC_BIND_GENERIC: /* explicit generic */ { - NDR_EHD_GENERIC * pDesc = (NDR_EHD_GENERIC *)pFormat; + const NDR_EHD_GENERIC *pDesc = (const NDR_EHD_GENERIC *)pFormat; void *pObject = NULL; void *pArg; const GENERIC_BINDING_ROUTINE_PAIR *pGenPair; @@ -534,8 +534,8 @@ static void client_do_args(PMIDL_STUB_ME for (i = 0; i < number_of_params; i++) { - NDR_PARAM_OIF_BASETYPE * pParam = - (NDR_PARAM_OIF_BASETYPE *)&pFormat[current_offset]; + const NDR_PARAM_OIF_BASETYPE *pParam = + (const NDR_PARAM_OIF_BASETYPE *)&pFormat[current_offset]; unsigned char * pArg; current_stack_offset = pParam->stack_offset; @@ -584,8 +584,8 @@ static void client_do_args(PMIDL_STUB_ME } else { - NDR_PARAM_OIF_OTHER * pParamOther = - (NDR_PARAM_OIF_OTHER *)&pFormat[current_offset]; + const NDR_PARAM_OIF_OTHER *pParamOther = + (const NDR_PARAM_OIF_OTHER *)&pFormat[current_offset]; const unsigned char * pTypeFormat = &(pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]); @@ -658,8 +658,8 @@ static void client_do_args_old_format(PM */ for (i = 0; TRUE; i++) { - NDR_PARAM_OI_BASETYPE * pParam = - (NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; + const NDR_PARAM_OI_BASETYPE *pParam = + (const NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; /* note: current_stack_offset starts after the This pointer * if present, so adjust this */ unsigned short current_stack_offset_adjusted = current_stack_offset + @@ -711,8 +711,8 @@ static void client_do_args_old_format(PM } else { - NDR_PARAM_OI_OTHER * pParamOther = - (NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; + const NDR_PARAM_OI_OTHER *pParamOther = + (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; const unsigned char *pTypeFormat = &pStubMsg->StubDesc->pFormatTypes[pParamOther->type_offset]; @@ -791,7 +791,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - NDR_PROC_HEADER_RPC * pProcHeader = (NDR_PROC_HEADER_RPC *)&pFormat[0]; + const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; stack_size = pProcHeader->stack_size; procedure_number = pProcHeader->proc_num; pFormat += sizeof(NDR_PROC_HEADER_RPC); @@ -841,8 +841,8 @@ #endif if (bV2Format) { - NDR_PROC_PARTIAL_OIF_HEADER * pOIFHeader = - (NDR_PROC_PARTIAL_OIF_HEADER*)pFormat; + const NDR_PROC_PARTIAL_OIF_HEADER *pOIFHeader = + (const NDR_PROC_PARTIAL_OIF_HEADER *)pFormat; Oif_flags = pOIFHeader->Oi2Flags; number_of_params = pOIFHeader->number_of_params; @@ -854,8 +854,8 @@ #endif if (Oif_flags.HasExtensions) { - NDR_PROC_HEADER_EXTS * pExtensions = - (NDR_PROC_HEADER_EXTS *)pFormat; + const NDR_PROC_HEADER_EXTS *pExtensions = + (const NDR_PROC_HEADER_EXTS *)pFormat; ext_flags = pExtensions->Flags2; pFormat += pExtensions->Size; } @@ -864,7 +864,7 @@ #endif /* store the RPC flags away */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) - rpcMsg.RpcFlags = ((NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags; + rpcMsg.RpcFlags = ((const NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags; /* use alternate memory allocation routines */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCSSALLOC) @@ -1137,7 +1137,7 @@ long WINAPI NdrStubCall2( if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - NDR_PROC_HEADER_RPC * pProcHeader = (NDR_PROC_HEADER_RPC *)&pFormat[0]; + const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; stack_size = pProcHeader->stack_size; current_offset = sizeof(NDR_PROC_HEADER_RPC); @@ -1185,8 +1185,8 @@ long WINAPI NdrStubCall2( if (bV2Format) { - NDR_PROC_PARTIAL_OIF_HEADER * pOIFHeader = - (NDR_PROC_PARTIAL_OIF_HEADER*)&pFormat[current_offset]; + const NDR_PROC_PARTIAL_OIF_HEADER *pOIFHeader = + (const NDR_PROC_PARTIAL_OIF_HEADER *)&pFormat[current_offset]; Oif_flags = pOIFHeader->Oi2Flags; number_of_params = pOIFHeader->number_of_params; @@ -1198,8 +1198,8 @@ long WINAPI NdrStubCall2( if (Oif_flags.HasExtensions) { - NDR_PROC_HEADER_EXTS * pExtensions = - (NDR_PROC_HEADER_EXTS *)&pFormat[current_offset]; + const NDR_PROC_HEADER_EXTS *pExtensions = + (const NDR_PROC_HEADER_EXTS *)&pFormat[current_offset]; ext_flags = pExtensions->Flags2; current_offset += pExtensions->Size; } @@ -1211,7 +1211,7 @@ long WINAPI NdrStubCall2( /* store the RPC flags away */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) - pRpcMsg->RpcFlags = ((NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags; + pRpcMsg->RpcFlags = ((const NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags; /* use alternate memory allocation routines */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCSSALLOC) @@ -1329,7 +1329,7 @@ #endif if (bV2Format) /* new parameter format */ { const NDR_PARAM_OIF_BASETYPE *pParam = - (NDR_PARAM_OIF_BASETYPE *)&pFormat[current_offset]; + (const NDR_PARAM_OIF_BASETYPE *)&pFormat[current_offset]; unsigned char *pArg; current_stack_offset = pParam->stack_offset; @@ -1394,8 +1394,8 @@ #endif } else { - NDR_PARAM_OIF_OTHER * pParamOther = - (NDR_PARAM_OIF_OTHER *)&pFormat[current_offset]; + const NDR_PARAM_OIF_OTHER *pParamOther = + (const NDR_PARAM_OIF_OTHER *)&pFormat[current_offset]; const unsigned char * pTypeFormat = &(pStubDesc->pFormatTypes[pParamOther->type_offset]); @@ -1456,8 +1456,8 @@ #endif } else /* old parameter format */ { - NDR_PARAM_OI_BASETYPE *pParam = - (NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; + const NDR_PARAM_OI_BASETYPE *pParam = + (const NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; /* note: current_stack_offset starts after the This pointer * if present, so adjust this */ unsigned short current_stack_offset_adjusted = current_stack_offset + @@ -1505,8 +1505,8 @@ #endif } else { - NDR_PARAM_OI_OTHER * pParamOther = - (NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; + const NDR_PARAM_OI_OTHER *pParamOther = + (const NDR_PARAM_OI_OTHER *)&pFormat[current_offset]; const unsigned char * pTypeFormat = &pStubDesc->pFormatTypes[pParamOther->type_offset];

1 0

Andrew Talbot : rpcrt4: Cast-qual warnings fix.
by Alexandre Julliard Sept. 26, 2006

Sept. 26, 2006

Module: wine Branch: master Commit: 269f77d8722d5cdc4ee32eb748eb29de40a013c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=269f77d8722d5cdc4ee32eb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Sep 25 21:11:15 2006 +0100 rpcrt4: Cast-qual warnings fix. --- dlls/rpcrt4/cpsf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index a10e231..dcf3721 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -225,7 +225,7 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODU if (RegCreateKeyExA(HKEY_CLASSES_ROOT, keyname, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) { if (name) - RegSetValueExA(key, NULL, 0, REG_SZ, (LPBYTE)name, strlen(name)); + RegSetValueExA(key, NULL, 0, REG_SZ, (const BYTE *)name, strlen(name)); if (RegCreateKeyExA(key, "ProxyStubClsid32", 0, NULL, 0, KEY_WRITE, NULL, &subkey, NULL) == ERROR_SUCCESS) { snprintf(module, sizeof(module), "{%s}", clsid); @@ -245,11 +245,11 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODU TRACE("registering CLSID %s => %s\n", clsid, module); if (RegCreateKeyExA(HKEY_CLASSES_ROOT, keyname, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) { - RegSetValueExA(subkey, NULL, 0, REG_SZ, (LPBYTE)"PSFactoryBuffer", strlen("PSFactoryBuffer")); + RegSetValueExA(subkey, NULL, 0, REG_SZ, (const BYTE *)"PSFactoryBuffer", strlen("PSFactoryBuffer")); if (RegCreateKeyExA(key, "InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &subkey, NULL) == ERROR_SUCCESS) { RegSetValueExA(subkey, NULL, 0, REG_SZ, (LPBYTE)module, strlen(module)); - RegSetValueExA(subkey, "ThreadingModel", 0, REG_SZ, (LPBYTE)"Both", strlen("Both")); + RegSetValueExA(subkey, "ThreadingModel", 0, REG_SZ, (const BYTE *)"Both", strlen("Both")); RegCloseKey(subkey); } RegCloseKey(key);

1 0