November 2006 - Wine-Commits

H. Verbeet : wined3d: Fix GL_ARB_texture_cube_map extension support.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 8afe27dacd3e0c7b0de4c415bd547ced54395b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afe27dacd3e0c7b0de4c415b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Nov 18 17:07:32 2006 +0100 wined3d: Fix GL_ARB_texture_cube_map extension support. --- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/cubetexture.c | 9 --------- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d_gl.h | 18 ++++++++++++++++++ 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 277edbf..5e157eb 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -319,7 +319,7 @@ HRESULT shader_get_registers_used( reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_VOLUME; break; - case GLTEXTURECUBEMAP: + case GL_TEXTURE_CUBE_MAP_ARB: reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_CUBE; break; diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index c16740a..a55fdb1 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -27,21 +27,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->resource.wineD3DDevice)->wineD3D))->gl_info static const GLenum cube_targets[6] = { -#if defined(GL_VERSION_1_3) - GL_TEXTURE_CUBE_MAP_POSITIVE_X, - GL_TEXTURE_CUBE_MAP_NEGATIVE_X, - GL_TEXTURE_CUBE_MAP_POSITIVE_Y, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, - GL_TEXTURE_CUBE_MAP_POSITIVE_Z, - GL_TEXTURE_CUBE_MAP_NEGATIVE_Z -#else GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB, GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB, GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB -#endif }; /* ******************************************* diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 8ddb017..7b60054 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1940,7 +1940,7 @@ static void drawPrimitiveUploadTexturesP glDisable(GL_TEXTURE_CUBE_MAP_ARB); glDisable(GL_TEXTURE_2D); break; - case GLTEXTURECUBEMAP: + case GL_TEXTURE_CUBE_MAP_ARB: glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_3D); break; @@ -2005,7 +2005,7 @@ static void drawPrimitiveUploadTextures( glDisable(GL_TEXTURE_CUBE_MAP_ARB); glDisable(GL_TEXTURE_2D); break; - case GLTEXTURECUBEMAP: + case GL_TEXTURE_CUBE_MAP_ARB: glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_3D); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b0a315..00fe8d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -215,8 +215,6 @@ extern int num_lock; (vec)[2] = D3DCOLOR_B(dw); \ (vec)[3] = D3DCOLOR_A(dw); -#define GLTEXTURECUBEMAP GL_TEXTURE_CUBE_MAP_ARB - /* DirectX Device Limits */ /* --------------------- */ #define MAX_LEVELS 256 /* Maximum number of mipmap levels. Guessed at 256 */ diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index c3b4528..0e48f5a 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -208,6 +208,24 @@ typedef void (APIENTRY *WINED3D_PFNGLMUL typedef void (APIENTRY *WINED3D_PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); typedef void (APIENTRY *WINED3D_PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); typedef void (APIENTRY *WINED3D_PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); + +/* GL_ARB_texture_cube_map */ +#ifndef GL_ARB_texture_cube_map +#define GL_ARB_texture_cube_map 1 +#define GL_NORMAL_MAP_ARB 0x8511 +#define GL_REFLECTION_MAP_ARB 0x8512 +#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A +#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C +#endif + /* GL_ARB_point_parameters */ #ifndef GL_ARB_point_parameters #define GL_ARB_point_parameters 1

1 0

Alexandre Julliard : winmm: Avoid using sizeof() in traces.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 0beeffa935be246a91d0f5febdfc7dac8c4fe60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0beeffa935be246a91d0f5feb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 11:27:18 2006 +0100 winmm: Avoid using sizeof() in traces. --- dlls/winmm/message16.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index 14dbbf4..6ecf34b 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -968,11 +968,10 @@ static WINMM_MapType MMDRV_WaveIn_Map32 /* FIXME: nothing on wh32->lpNext */ /* could link the wh32->lpNext at this level for memory house keeping */ wh32->lpNext = wh16; /* for reuse in unprepare and write */ - TRACE("wh16=%08x wh16->lpData=%p wh32->buflen=%u wh32->lpData=%p\n", - seg_ptr + sizeof(LPWAVEHDR), wh16->lpData, - wh32->dwBufferLength, wh32->lpData); *lpParam1 = seg_ptr + sizeof(LPWAVEHDR); *lpParam2 = sizeof(WAVEHDR); + TRACE("wh16=%08lx wh16->lpData=%p wh32->buflen=%u wh32->lpData=%p\n", + *lpParam1, wh16->lpData, wh32->dwBufferLength, wh32->lpData); ret = WINMM_MAP_OKMEM; } else { @@ -990,14 +989,14 @@ static WINMM_MapType MMDRV_WaveIn_Map32 assert(*(LPWAVEHDR*)ptr == wh32); - TRACE("wh16=%08x wh16->lpData=%p wh32->buflen=%u wh32->lpData=%p\n", - seg_ptr + sizeof(LPWAVEHDR), wh16->lpData, wh32->dwBufferLength, wh32->lpData); - if (wMsg == WIDM_ADDBUFFER) memcpy((LPSTR)wh16 + sizeof(WAVEHDR), wh32->lpData, wh32->dwBufferLength); *lpParam1 = seg_ptr + sizeof(LPWAVEHDR); *lpParam2 = sizeof(WAVEHDR); + TRACE("wh16=%08lx wh16->lpData=%p wh32->buflen=%u wh32->lpData=%p\n", + *lpParam1, wh16->lpData, wh32->dwBufferLength, wh32->lpData); + /* dwBufferLength can be reduced between prepare & write */ if (wMsg == WIDM_ADDBUFFER && wh16->dwBufferLength < wh32->dwBufferLength) { ERR("Size of buffer has been increased from %d to %d, keeping initial value\n", @@ -1528,11 +1527,10 @@ static WINMM_MapType MMDRV_WaveOut_Map3 /* FIXME: nothing on wh32->lpNext */ /* could link the wh32->lpNext at this level for memory house keeping */ wh32->lpNext = wh16; /* for reuse in unprepare and write */ - TRACE("wh16=%08x wh16->lpData=%p wh32->buflen=%u wh32->lpData=%p\n", - seg_ptr + sizeof(LPWAVEHDR), wh16->lpData, - wh32->dwBufferLength, wh32->lpData); *lpParam1 = seg_ptr + sizeof(LPWAVEHDR); *lpParam2 = sizeof(WAVEHDR); + TRACE("wh16=%08lx wh16->lpData=%p wh32->buflen=%u wh32->lpData=%p\n", + *lpParam1, wh16->lpData, wh32->dwBufferLength, wh32->lpData); ret = WINMM_MAP_OKMEM; } else { @@ -1550,15 +1548,14 @@ static WINMM_MapType MMDRV_WaveOut_Map3 assert(*(LPWAVEHDR*)ptr == wh32); - TRACE("wh16=%08x wh16->lpData=%p wh32->buflen=%u wh32->lpData=%p\n", - seg_ptr + sizeof(LPWAVEHDR), wh16->lpData, - wh32->dwBufferLength, wh32->lpData); - if (wMsg == WODM_WRITE) memcpy((LPSTR)wh16 + sizeof(WAVEHDR), wh32->lpData, wh32->dwBufferLength); *lpParam1 = seg_ptr + sizeof(LPWAVEHDR); *lpParam2 = sizeof(WAVEHDR); + TRACE("wh16=%08lx wh16->lpData=%p wh32->buflen=%u wh32->lpData=%p\n", + *lpParam1, wh16->lpData, wh32->dwBufferLength, wh32->lpData); + /* dwBufferLength can be reduced between prepare & write */ if (wMsg == WODM_WRITE && wh16->dwBufferLength < wh32->dwBufferLength) { ERR("Size of buffer has been increased from %d to %d, keeping initial value\n",

1 0

James Hawkins : kernel32: Replace magic numbers with descriptive defines.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 15fd7a028fb277514db870c62cc1a8b9b2ad5432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fd7a028fb277514db870c62… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Nov 17 18:13:03 2006 -0800 kernel32: Replace magic numbers with descriptive defines. --- dlls/kernel32/lzexpand.c | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c index 2804a50..b772296 100644 --- a/dlls/kernel32/lzexpand.c +++ b/dlls/kernel32/lzexpand.c @@ -58,14 +58,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); */ #define GETLEN 2048 +#define LZ_MAGIC_LEN 8 +#define LZ_HEADER_LEN 14 + /* Format of first 14 byte of LZ compressed file */ struct lzfileheader { - BYTE magic[8]; + BYTE magic[LZ_MAGIC_LEN]; BYTE compressiontype; CHAR lastchar; DWORD reallength; }; -static BYTE LZMagic[8]={'S','Z','D','D',0x88,0xf0,0x27,0x33}; +static BYTE LZMagic[LZ_MAGIC_LEN]={'S','Z','D','D',0x88,0xf0,0x27,0x33}; + +#define LZ_TABLE_SIZE 0x1000 struct lzstate { HFILE realfd; /* the real filedescriptor */ @@ -75,7 +80,7 @@ struct lzstate { DWORD realcurrent; /* the position the decompressor currently is */ DWORD realwanted; /* the position the user wants to read from */ - BYTE table[0x1000]; /* the rotating LZ table */ + BYTE table[LZ_TABLE_SIZE]; /* the rotating LZ table */ UINT curtabent; /* CURrent TABle ENTry */ BYTE stringlen; /* length and position of current string */ @@ -92,8 +97,9 @@ struct lzstate { #define MAX_LZSTATES 16 static struct lzstate *lzstates[MAX_LZSTATES]; -#define IS_LZ_HANDLE(h) (((h) >= 0x400) && ((h) < 0x400+MAX_LZSTATES)) -#define GET_LZ_STATE(h) (IS_LZ_HANDLE(h) ? lzstates[(h)-0x400] : NULL) +#define LZ_MIN_HANDLE 0x400 +#define IS_LZ_HANDLE(h) (((h) >= LZ_MIN_HANDLE) && ((h) < LZ_MIN_HANDLE+MAX_LZSTATES)) +#define GET_LZ_STATE(h) (IS_LZ_HANDLE(h) ? lzstates[(h)-LZ_MIN_HANDLE] : NULL) /* reads one compressed byte, including buffering */ #define GET(lzs,b) _lzget(lzs,&b) @@ -124,7 +130,7 @@ _lzget(struct lzstate *lzs,BYTE *b) { */ static INT read_header(HFILE fd,struct lzfileheader *head) { - BYTE buf[14]; + BYTE buf[LZ_HEADER_LEN]; if (_llseek(fd,0,SEEK_SET)==-1) return LZERROR_BADINHANDLE; @@ -132,16 +138,16 @@ static INT read_header(HFILE fd,struct l /* We can't directly read the lzfileheader struct due to * structure element alignment */ - if (_lread(fd,buf,14)<14) + if (_lread(fd,buf,LZ_HEADER_LEN)<LZ_HEADER_LEN) return 0; - memcpy(head->magic,buf,8); - memcpy(&(head->compressiontype),buf+8,1); - memcpy(&(head->lastchar),buf+9,1); + memcpy(head->magic,buf,LZ_MAGIC_LEN); + memcpy(&(head->compressiontype),buf+LZ_MAGIC_LEN,1); + memcpy(&(head->lastchar),buf+LZ_MAGIC_LEN+1,1); /* FIXME: consider endianess on non-intel architectures */ - memcpy(&(head->reallength),buf+10,4); + memcpy(&(head->reallength),buf+LZ_MAGIC_LEN+2,4); - if (memcmp(head->magic,LZMagic,8)) + if (memcmp(head->magic,LZMagic,LZ_MAGIC_LEN)) return 0; if (head->compressiontype!='A') return LZERROR_UNKNOWNALG; @@ -205,10 +211,10 @@ HFILE WINAPI LZInit( HFILE hfSrc ) } /* Yes, preinitialize with spaces */ - memset(lzs->table,' ',0x1000); + memset(lzs->table,' ',LZ_TABLE_SIZE); /* Yes, start 16 byte from the END of the table */ lzs->curtabent = 0xff0; - return 0x400 + i; + return LZ_MIN_HANDLE + i; } @@ -384,12 +390,12 @@ INT WINAPI LZRead( HFILE fd, LPSTR vbuf, */ if (lzs->realcurrent>lzs->realwanted) { /* flush decompressor state */ - _llseek(lzs->realfd,14,SEEK_SET); + _llseek(lzs->realfd,LZ_HEADER_LEN,SEEK_SET); GET_FLUSH(lzs); lzs->realcurrent= 0; lzs->bytetype = 0; lzs->stringlen = 0; - memset(lzs->table,' ',0x1000); + memset(lzs->table,' ',LZ_TABLE_SIZE); lzs->curtabent = 0xFF0; } while (lzs->realcurrent<lzs->realwanted) { @@ -578,7 +584,7 @@ void WINAPI LZClose( HFILE fd ) { HeapFree( GetProcessHeap(), 0, lzs->get ); CloseHandle((HANDLE)lzs->realfd); - lzstates[fd - 0x400] = NULL; + lzstates[fd - LZ_MIN_HANDLE] = NULL; HeapFree( GetProcessHeap(), 0, lzs ); } }

1 0

Andrew Talbot : user32: Cast-qual warnings fix.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: a07dceb0027723d1533abf54250abb54fbe580b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07dceb0027723d1533abf542… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 18 14:23:01 2006 +0000 user32: Cast-qual warnings fix. --- dlls/user32/hook.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 557f666..be77db4 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -211,6 +211,8 @@ static LRESULT call_hook_AtoW( HOOKPROC CBT_CREATEWNDA *cbtcwA = (CBT_CREATEWNDA *)lparam; CBT_CREATEWNDW cbtcwW; CREATESTRUCTW csW; + LPWSTR nameW = NULL; + LPWSTR classW = NULL; cbtcwW.lpcs = &csW; cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter; @@ -219,17 +221,17 @@ static LRESULT call_hook_AtoW( HOOKPROC if (HIWORD(cbtcwA->lpcs->lpszName)) { RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszName); - csW.lpszName = usBuffer.Buffer; + csW.lpszName = nameW = usBuffer.Buffer; } if (HIWORD(cbtcwA->lpcs->lpszClass)) { RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); - csW.lpszClass = usBuffer.Buffer; + csW.lpszClass = classW = usBuffer.Buffer; } ret = proc( code, wparam, (LPARAM)&cbtcwW ); cbtcwA->hwndInsertAfter = cbtcwW.hwndInsertAfter; - if (HIWORD(csW.lpszName)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszName ); - if (HIWORD(csW.lpszClass)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszClass ); + HeapFree( GetProcessHeap(), 0, nameW ); + HeapFree( GetProcessHeap(), 0, classW ); } return ret; } @@ -249,6 +251,8 @@ static LRESULT call_hook_WtoA( HOOKPROC CBT_CREATEWNDA cbtcwA; CREATESTRUCTA csA; int len; + LPSTR nameA = NULL; + LPSTR classA = NULL; cbtcwA.lpcs = &csA; cbtcwA.hwndInsertAfter = cbtcwW->hwndInsertAfter; @@ -256,20 +260,22 @@ static LRESULT call_hook_WtoA( HOOKPROC if (HIWORD(cbtcwW->lpcs->lpszName)) { len = WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, NULL, 0, NULL, NULL ); - csA.lpszName = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); - WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, (LPSTR)csA.lpszName, len, NULL, NULL ); + nameA = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); + WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, nameA, len, NULL, NULL ); + csA.lpszName = nameA; } if (HIWORD(cbtcwW->lpcs->lpszClass)) { len = WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszClass, -1, NULL, 0, NULL, NULL ); - csA.lpszClass = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); - WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszClass, -1, (LPSTR)csA.lpszClass, len, NULL, NULL ); + classA = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); + WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszClass, -1, classA, len, NULL, NULL ); + csA.lpszClass = classA; } ret = proc( code, wparam, (LPARAM)&cbtcwA ); cbtcwW->hwndInsertAfter = cbtcwA.hwndInsertAfter; - if (HIWORD(csA.lpszName)) HeapFree( GetProcessHeap(), 0, (LPSTR)csA.lpszName ); - if (HIWORD(csA.lpszClass)) HeapFree( GetProcessHeap(), 0, (LPSTR)csA.lpszClass ); + HeapFree( GetProcessHeap(), 0, nameA ); + HeapFree( GetProcessHeap(), 0, classA ); } return ret; }

1 0

Andrew Talbot : user32: Cast-qual warnings fix.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: bc95bfd3c1466db5592951bde866450c3c712646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc95bfd3c1466db5592951bde… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 18 14:22:13 2006 +0000 user32: Cast-qual warnings fix. --- dlls/user32/edit.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 76f3e04..f93c9aa 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5014,11 +5014,12 @@ static void EDIT_WM_SetFont(EDITSTATE *e */ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode) { + LPWSTR textW = NULL; if (!unicode && text) { LPCSTR textA = (LPCSTR)text; INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); - LPWSTR textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); + textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); if (textW) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); text = textW; @@ -5035,7 +5036,7 @@ static void EDIT_WM_SetText(EDITSTATE *e TRACE("%s\n", debugstr_w(text)); EDIT_EM_ReplaceSel(es, FALSE, text, FALSE, FALSE); if(!unicode) - HeapFree(GetProcessHeap(), 0, (LPWSTR)text); + HeapFree(GetProcessHeap(), 0, textW); } else {

1 0

Andrew Talbot : user32: Cast-qual warnings fix.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 8831a79e902d583422d8c0f35b7f0f139e9769f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8831a79e902d583422d8c0f35… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 18 14:21:29 2006 +0000 user32: Cast-qual warnings fix. --- dlls/user32/dialog.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index aa6dc40..7d64790 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -285,20 +285,24 @@ static BOOL DIALOG_CreateControls32( HWN } else { - LPSTR class = (LPSTR)info.className; - LPSTR caption = (LPSTR)info.windowName; + LPCSTR class = (LPCSTR)info.className; + LPCSTR caption = (LPCSTR)info.windowName; + LPSTR class_tmp = NULL; + LPSTR caption_tmp = NULL; if (HIWORD(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.className, -1, NULL, 0, NULL, NULL ); - class = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, info.className, -1, class, len, NULL, NULL ); + class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, info.className, -1, class_tmp, len, NULL, NULL ); + class = class_tmp; } if (HIWORD(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, NULL, 0, NULL, NULL ); - caption = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, caption, len, NULL, NULL ); + caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, caption_tmp, len, NULL, NULL ); + caption = caption_tmp; } hwndCtrl = CreateWindowExA( info.exStyle | WS_EX_NOPARENTNOTIFY, class, caption, info.style | WS_CHILD, @@ -308,8 +312,8 @@ static BOOL DIALOG_CreateControls32( HWN MulDiv(info.cy, dlgInfo->yBaseUnit, 8), hwnd, (HMENU)info.id, hInst, (LPVOID)info.data ); - if (HIWORD(class)) HeapFree( GetProcessHeap(), 0, class ); - if (HIWORD(caption)) HeapFree( GetProcessHeap(), 0, caption ); + HeapFree( GetProcessHeap(), 0, class_tmp ); + HeapFree( GetProcessHeap(), 0, caption_tmp ); } if (!hwndCtrl) { @@ -595,26 +599,30 @@ static HWND DIALOG_CreateIndirect( HINST } else { - LPSTR class = (LPSTR)template.className; - LPSTR caption = (LPSTR)template.caption; + LPCSTR class = (LPCSTR)template.className; + LPCSTR caption = (LPCSTR)template.caption; + LPSTR class_tmp = NULL; + LPSTR caption_tmp = NULL; if (HIWORD(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.className, -1, NULL, 0, NULL, NULL ); - class = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, template.className, -1, class, len, NULL, NULL ); + class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, template.className, -1, class_tmp, len, NULL, NULL ); + class = class_tmp; } if (HIWORD(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.caption, -1, NULL, 0, NULL, NULL ); - caption = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, template.caption, -1, caption, len, NULL, NULL ); + caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, template.caption, -1, caption_tmp, len, NULL, NULL ); + caption = caption_tmp; } hwnd = CreateWindowExA(template.exStyle, class, caption, template.style & ~WS_VISIBLE, pos.x, pos.y, size.cx, size.cy, owner, hMenu, hInst, NULL ); - if (HIWORD(class)) HeapFree( GetProcessHeap(), 0, class ); - if (HIWORD(caption)) HeapFree( GetProcessHeap(), 0, caption ); + HeapFree( GetProcessHeap(), 0, class_tmp ); + HeapFree( GetProcessHeap(), 0, caption_tmp ); } if (!hwnd)

1 0

Andrew Talbot : user32: Cast-qual warnings fix.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 115af5bc8a3c0dd7e4acfb520675ff789daa330e URL: http://source.winehq.org/git/wine.git/?a=commit;h=115af5bc8a3c0dd7e4acfb520… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 18 14:24:55 2006 +0000 user32: Cast-qual warnings fix. --- dlls/user32/dde_client.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 243ea45..2d345f0 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -626,7 +626,7 @@ static HGLOBAL WDML_BuildExecuteCommand( * * */ -static WDML_XACT* WDML_ClientQueueExecute(WDML_CONV* pConv, LPCVOID pData, DWORD cbData) +static WDML_XACT* WDML_ClientQueueExecute(WDML_CONV* pConv, LPVOID pData, DWORD cbData) { WDML_XACT* pXAct; @@ -638,7 +638,7 @@ static WDML_XACT* WDML_ClientQueueExecut if (cbData == (DWORD)-1) { - HDDEDATA hDdeData = (HDDEDATA)pData; + HDDEDATA hDdeData = pData; pData = DdeAccessData(hDdeData, &cbData); if (pData) @@ -695,7 +695,7 @@ static WDML_QUEUE_STATE WDML_HandleExecu * * */ -static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPCVOID pData, DWORD cbData, +static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbData, UINT wFmt, HSZ hszItem) { WDML_XACT* pXAct;

1 0

Marcus Meissner : ntdll: Converted bitmask into TRUE/FALSE.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: c28a97e1168d869880f04326d1a2c85f0e9bbca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28a97e1168d869880f04326d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 18 11:09:36 2006 +0100 ntdll: Converted bitmask into TRUE/FALSE. --- dlls/ntdll/tape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index c8e3cd0..4ae1f92 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -232,7 +232,7 @@ static NTSTATUS TAPE_GetMediaParams( int #endif data->PartitionCount = 1; #ifdef HAVE_STRUCT_MTGET_MT_GSTAT - data->WriteProtected = GMT_WR_PROT(get.mt_gstat); + data->WriteProtected = (GMT_WR_PROT(get.mt_gstat) != 0); #else data->WriteProtected = 0; #endif

1 0

Marcus Meissner : kernel32: Added missing shift by 8.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 87f9dcdb2361ad1f55b71f4f5f98de105e201b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f9dcdb2361ad1f55b71f4f5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 18 11:07:32 2006 +0100 kernel32: Added missing shift by 8. --- dlls/kernel32/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e1dc46b..3eb8cf9 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1588,7 +1588,7 @@ BOOL WINAPI GetCPInfo( UINT codepage, LP } if (table->info.def_char & 0xff00) { - cpinfo->DefaultChar[0] = table->info.def_char & 0xff00; + cpinfo->DefaultChar[0] = (table->info.def_char & 0xff00) >> 8; cpinfo->DefaultChar[1] = table->info.def_char & 0x00ff; } else

1 0

H. Verbeet : wined3d: Allow the depth buffer to be shared between onscreen and offscreen rendering modes .
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: ef2c062c09fec6885c5165f6b282dff4f02cb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2c062c09fec6885c5165f6b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Nov 17 13:24:04 2006 +0100 wined3d: Allow the depth buffer to be shared between onscreen and offscreen rendering modes. --- dlls/wined3d/device.c | 8 ++ dlls/wined3d/drawprim.c | 196 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + dlls/wined3d/wined3d_private_types.h | 7 ++ 4 files changed, 212 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef2c062c09fec6885c516…

1 0