April 2006 - Wine-Commits - list.winehq.org

Mikołaj Zalewski : comctl32: Fix listview column resize.
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: c63f5f095ab15d8ab1af9308d4f9f3028f1a1e3c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c63f5f095ab15d8ab1af930… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Apr 12 17:50:33 2006 +0200 comctl32: Fix listview column resize. Fix the HDS_FULLDRAG headers notifications, invalidate such a control after a mouse move. --- dlls/comctl32/header.c | 46 +++++++++++++++++++--------------------------- 1 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 5e1c4c8..259a4d5 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1420,9 +1420,7 @@ static LRESULT HEADER_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - /* - *DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); - */ + DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); POINT pt; UINT flags; INT nItem, nWidth; @@ -1472,33 +1470,26 @@ HEADER_LButtonUp (HWND hwnd, WPARAM wPar HEADER_SendHeaderNotify (hwnd, HDN_ENDTRACKA, infoPtr->iMoveItem,HDI_WIDTH); - /* - * we want to do this even for HDS_FULLDRAG because this is where - * we send the HDN_ITEMCHANGING and HDN_ITEMCHANGED notifications - * - * if (!(dwStyle & HDS_FULLDRAG)) { - */ - + if (!(dwStyle & HDS_FULLDRAG)) { hdc = GetDC (hwnd); HEADER_DrawTrackLine (hwnd, hdc, infoPtr->xOldTrack); ReleaseDC (hwnd, hdc); - if (HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem, HDI_WIDTH)) - { - infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth; - } - else { - nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset; - if (nWidth < 0) - nWidth = 0; - infoPtr->items[infoPtr->iMoveItem].cxy = nWidth; - } + } + + if (HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem, HDI_WIDTH)) + { + infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth; + } + else { + nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset; + if (nWidth < 0) + nWidth = 0; + infoPtr->items[infoPtr->iMoveItem].cxy = nWidth; + } - HEADER_SetItemBounds (hwnd); - InvalidateRect(hwnd, NULL, TRUE); - HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem, HDI_WIDTH); - /* - * } - */ + HEADER_SetItemBounds (hwnd); + InvalidateRect(hwnd, NULL, TRUE); + HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem, HDI_WIDTH); } if (infoPtr->bCaptured) { @@ -1591,7 +1582,7 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar } else if (infoPtr->bTracking) { if (dwStyle & HDS_FULLDRAG) { - if (HEADER_SendHeaderNotify (hwnd, HDN_TRACKA, infoPtr->iMoveItem, HDI_WIDTH)) + if (!HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem, HDI_WIDTH)) { nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset; if (nWidth < 0) @@ -1600,6 +1591,7 @@ HEADER_MouseMove (HWND hwnd, WPARAM wPar HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem, HDI_WIDTH); } HEADER_SetItemBounds (hwnd); + InvalidateRect(hwnd, NULL, FALSE); } else { hdc = GetDC (hwnd);

1 0

Dmitry Timoshkov : avifil32: Avoid not necessary zeroing out of an allocated memory block.
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: 14aab5f3cb34cca8d24244622464eec39ae09a65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14aab5f3cb34cca8d242446… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 12 19:32:22 2006 +0900 avifil32: Avoid not necessary zeroing out of an allocated memory block. --- dlls/avifil32/acmstream.c | 2 +- dlls/avifil32/api.c | 15 ++++++++------- dlls/avifil32/editstream.c | 4 ++-- dlls/avifil32/getframe.c | 4 ++-- dlls/avifil32/icmstream.c | 8 ++++---- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index e0e75ec..067f34a 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -712,7 +712,7 @@ static HRESULT AVIFILE_OpenCompressor(IA if (This->lpOutFormat == NULL) { /* we must decode to default format */ This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->cbOutFormat); + This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); if (This->lpOutFormat == NULL) return AVIERR_MEMORY; diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 07111e7..44bdf91 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1273,7 +1273,7 @@ static BOOL AVISaveOptionsFmtChoose(HWND sInfo.dwStart, &size); if (size < (LONG)sizeof(PCMWAVEFORMAT)) size = sizeof(PCMWAVEFORMAT); - afmtc.pwfxEnum = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + afmtc.pwfxEnum = HeapAlloc(GetProcessHeap(), 0, size); if (afmtc.pwfxEnum != NULL) { AVIStreamReadFormat(SaveOpts.ppavis[SaveOpts.nCurrent], sInfo.dwStart, afmtc.pwfxEnum, &size); @@ -1318,7 +1318,7 @@ static void AVISaveOptionsUpdate(HWND hW szFormat[0] = 0; /* read format to build format description string */ - lpFormat = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + lpFormat = HeapAlloc(GetProcessHeap(), 0, size); if (lpFormat != NULL) { if (SUCCEEDED(AVIStreamReadFormat(SaveOpts.ppavis[SaveOpts.nCurrent],sInfo.dwStart,lpFormat, &size))) { if (sInfo.fccType == streamtypeVIDEO) { @@ -1481,7 +1481,7 @@ BOOL WINAPI AVISaveOptions(HWND hWnd, UI /* save options in case the user presses cancel */ if (ppOptions != NULL && nStreams > 1) { - pSavedOptions = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nStreams * sizeof(AVICOMPRESSOPTIONS)); + pSavedOptions = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(AVICOMPRESSOPTIONS)); if (pSavedOptions == NULL) return FALSE; @@ -1719,7 +1719,8 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, } /* allocate buffer for formats, data, etc. of an initial size of 64 kBytes*/ - lpBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbBuffer = 0x00010000); + cbBuffer = 0x00010000; + lpBuffer = HeapAlloc(GetProcessHeap(), 0, cbBuffer); if (lpBuffer == NULL) { hres = AVIERR_MEMORY; goto error; @@ -1862,7 +1863,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, lFirstVideo - lStart[curStream], lpBuffer, cbBuffer, &lReadBytes, &lReadSamples); } while ((hres == AVIERR_BUFFERTOOSMALL) && - (lpBuffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lpBuffer, cbBuffer *= 2)) != NULL); + (lpBuffer = HeapReAlloc(GetProcessHeap(), 0, lpBuffer, cbBuffer *= 2)) != NULL); if (lpBuffer == NULL) hres = AVIERR_MEMORY; if (FAILED(hres)) @@ -1931,7 +1932,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, hres = AVIStreamRead(pInStreams[curStream],sInfo.dwStart,lSamples, lpBuffer,cbBuffer,&lReadBytes,&lReadSamples); } while ((hres == AVIERR_BUFFERTOOSMALL) && - (lpBuffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lpBuffer, cbBuffer *= 2)) != NULL); + (lpBuffer = HeapReAlloc(GetProcessHeap(), 0, lpBuffer, cbBuffer *= 2)) != NULL); if (lpBuffer == NULL) hres = AVIERR_MEMORY; if (FAILED(hres)) @@ -1977,7 +1978,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, hres = AVIStreamRead(pInStreams[curStream], sInfo.dwStart, 1, lpBuffer, cbBuffer,&lReadBytes,&lReadSamples); } while ((hres == AVIERR_BUFFERTOOSMALL) && - (lpBuffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lpBuffer, cbBuffer *= 2)) != NULL); + (lpBuffer = HeapReAlloc(GetProcessHeap(), 0, lpBuffer, cbBuffer *= 2)) != NULL); if (lpBuffer == NULL) hres = AVIERR_MEMORY; if (FAILED(hres)) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index e4b1c98..bd654a0 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -329,11 +329,11 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR return FALSE; /* sizes match, now get formats and compare them */ - fmt1 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size1); + fmt1 = HeapAlloc(GetProcessHeap(), 0, size1); if (fmt1 == NULL) return FALSE; if (SUCCEEDED(AVIStreamReadFormat(avi1, start1, fmt1, &size1))) { - fmt2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size1); + fmt2 = HeapAlloc(GetProcessHeap(), 0, size1); if (fmt2 != NULL) { if (SUCCEEDED(AVIStreamReadFormat(avi2, start2, fmt2, &size1))) status = (memcmp(fmt1, fmt2, size1) == 0); diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 7f5cd62..3512683 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -366,7 +366,7 @@ static HRESULT WINAPI IGetFrame_fnSetFor IAVIStream_ReadFormat(This->pStream, sInfo.dwStart, NULL, &This->cbInFormat); - This->lpInFormat = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->cbInFormat + This->cbInBuffer); + This->lpInFormat = HeapAlloc(GetProcessHeap(), 0, This->cbInFormat + This->cbInBuffer); if (This->lpInFormat == NULL) { AVIFILE_CloseCompressor(This); return AVIERR_MEMORY; @@ -406,7 +406,7 @@ static HRESULT WINAPI IGetFrame_fnSetFor /* need memory for output format? */ if (This->lpOutFormat == NULL) { This->lpOutFormat = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); if (This->lpOutFormat == NULL) { AVIFILE_CloseCompressor(This); return AVIERR_MEMORY; diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index ea1a248..0a87a6d 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -488,7 +488,7 @@ static HRESULT WINAPI ICMStream_fnSetFor size = ICCompressGetFormatSize(This->hic, This->lpbiInput); if (size < sizeof(BITMAPINFOHEADER)) return AVIERR_COMPRESSOR; - This->lpbiOutput = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + This->lpbiOutput = HeapAlloc(GetProcessHeap(), 0, size); if (This->lpbiOutput == NULL) return AVIERR_MEMORY; This->cbOutput = size; @@ -517,7 +517,7 @@ static HRESULT WINAPI ICMStream_fnSetFor if (This->lKeyFrameEvery != 1 && (This->dwICMFlags & VIDCF_FASTTEMPORALC) == 0) { size = ICDecompressGetFormatSize(This->hic, This->lpbiOutput); - This->lpbiPrev = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + This->lpbiPrev = HeapAlloc(GetProcessHeap(), 0, size); if (This->lpbiPrev == NULL) return AVIERR_MEMORY; if (ICDecompressGetFormat(This->hic, This->lpbiOutput, This->lpbiPrev) < S_OK) @@ -913,7 +913,7 @@ static HRESULT AVIFILE_OpenGetFrame(IAVI size = ICCompressGetFormatSize(This->hic, lpbi); if ((LONG)size < (LONG)sizeof(BITMAPINFOHEADER)) return AVIERR_COMPRESSOR; - This->lpbiOutput = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + This->lpbiOutput = HeapAlloc(GetProcessHeap(), 0, size); if (This->lpbiOutput == NULL) return AVIERR_MEMORY; This->cbOutput = size; @@ -945,7 +945,7 @@ static HRESULT AVIFILE_OpenGetFrame(IAVI if (This->lKeyFrameEvery != 1 && (This->dwICMFlags & VIDCF_FASTTEMPORALC) == 0) { size = ICDecompressGetFormatSize(This->hic, This->lpbiOutput); - This->lpbiPrev = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + This->lpbiPrev = HeapAlloc(GetProcessHeap(), 0, size); if (This->lpbiPrev == NULL) return AVIERR_MEMORY; if (ICDecompressGetFormat(This->hic, This->lpbiOutput, This->lpbiPrev) < S_OK)

1 0

Stefan Dösinger : wined3d: Add a resource dumper.
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: e0c87731996190c9528445f2f1ba2f6ed995d566 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0c87731996190c9528445f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 10 19:39:53 2006 +0200 wined3d: Add a resource dumper. --- dlls/wined3d/device.c | 4 ---- dlls/wined3d/resource.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4385b24..71147f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -434,11 +434,7 @@ ULONG WINAPI IWineD3DDeviceImpl_Release( if (This->resources != NULL ) { FIXME("(%p) Device released with resources still bound, acceptable but unexpected\n", This); - -#if 0 /* TODO: Dump a list of all the resources still bound */ dumpResources(This->resources); -#endif - /* TODO: set the resources to a lost state */ } } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index be43046..5a4b550 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -230,6 +230,14 @@ HRESULT WINAPI IWineD3DResourceImpl_GetP return WINED3D_OK; } +void dumpResources(ResourceList *resources) { + ResourceList *iterator = resources; + + while(iterator) { + FIXME("Leftover resource %p with type %d,%s\n", iterator->resource, IWineD3DResource_GetType(iterator->resource), debug_d3dresourcetype(IWineD3DResource_GetType(iterator->resource))); + iterator = iterator->next; + } +} static const IWineD3DResourceVtbl IWineD3DResource_Vtbl = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d5d5cce..4ea820e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -488,6 +488,9 @@ typedef struct ResourceList { struct ResourceList *next; } ResourceList; +/* A helper function that dumps a resource list */ +void dumpResources(ResourceList *resources); + /***************************************************************************** * IWineD3DDevice implementation structure */

1 0

Jean-Philippe Theriault : gdi32: Fix for PlayEnhMetaFileRecord support of EMR_SELECTPALETTE record.
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: 6e4b960a1cfe765dcaf03e5e3f50559a6e6bd6bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e4b960a1cfe765dcaf03e5… Author: Jean-Philippe Theriault <Jean-Philippe_Theriault(a)cimmetry.com> Date: Tue Apr 11 10:51:15 2006 -0400 gdi32: Fix for PlayEnhMetaFileRecord support of EMR_SELECTPALETTE record. --- dlls/gdi/enhmetafile.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi/enhmetafile.c index 7ac6a40..56273c9 100644 --- a/dlls/gdi/enhmetafile.c +++ b/dlls/gdi/enhmetafile.c @@ -1162,7 +1162,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( if( lpSelectPal->ihPal & 0x80000000 ) { SelectPalette( hdc, GetStockObject(lpSelectPal->ihPal & 0x7fffffff), TRUE); } else { - (handletable->objectHandle)[ lpSelectPal->ihPal ] = SelectPalette( hdc, (handletable->objectHandle)[lpSelectPal->ihPal], TRUE); } break;

1 0

Eric Pouech : kernel32: Added some tests for toolhelp functions.
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: 69804258ca6a1933b8447dc064d1b88e4885ab72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69804258ca6a1933b8447dc… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Apr 8 11:22:38 2006 +0200 kernel32: Added some tests for toolhelp functions. --- dlls/kernel/tests/.gitignore | 1 dlls/kernel/tests/Makefile.in | 1 dlls/kernel/tests/toolhelp.c | 318 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 320 insertions(+), 0 deletions(-) create mode 100644 dlls/kernel/tests/toolhelp.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=69804258ca6a1933b84…

1 0

Eric Pouech : kernel32: Rewrote toolhelp implementation only on top of ntdll functions.
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: 4f3682f4280a482a8b37672a3801894e139832db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f3682f4280a482a8b37672… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Apr 8 11:22:45 2006 +0200 kernel32: Rewrote toolhelp implementation only on top of ntdll functions. --- dlls/kernel/toolhelp.c | 544 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 390 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4f3682f4280a482a8b3…

1 0

Stefan Leichter : winetest: Added dnsapi tests.
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: 3e0e71870e56afacb288d6821c17e9b0ee4cdca3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e0e71870e56afacb288d68… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Tue Apr 11 19:57:00 2006 +0200 winetest: Added dnsapi tests. --- programs/winetest/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 7e2c692..9124cf5 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -30,6 +30,7 @@ TESTBINS = \ comctl32_test.exe$(DLLEXT) \ crypt32_test.exe$(DLLEXT) \ dinput_test.exe$(DLLEXT) \ + dnsapi_test.exe$(DLLEXT) \ dsound_test.exe$(DLLEXT) \ gdi32_test.exe$(DLLEXT) \ iphlpapi_test.exe$(DLLEXT) \ @@ -117,6 +118,8 @@ ddraw_test.exe$(DLLEXT): $(DLLDIR)/ddraw cp $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) $@ && $(STRIP) $@ dinput_test.exe$(DLLEXT): $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) cp $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) $@ && $(STRIP) $@ +dnsapi_test.exe$(DLLEXT): $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT) + cp $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ dsound_test.exe$(DLLEXT): $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) cp $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) $@ && $(STRIP) $@ gdi32_test.exe$(DLLEXT): $(DLLDIR)/gdi/tests/gdi32_test.exe$(DLLEXT)

1 0

Ivan Gyurdiev : wined3d: Enable texld instruction (shaders 1.4).
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: c1a6e910ce2786488297ea4b9b76c3ffd8c741fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1a6e910ce2786488297ea4… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed Apr 12 05:05:24 2006 -0400 wined3d: Enable texld instruction (shaders 1.4). --- dlls/wined3d/pixelshader.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index d3c2619..a3533a6 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -704,7 +704,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI {D3DSIO_TEXCOORD, "texcrd", "undefined", 2, pshader_texcoord, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)}, {D3DSIO_TEXKILL, "texkill", "KIL", 1, pshader_texkill, D3DPS_VERSION(1,0), D3DPS_VERSION(1,4)}, {D3DSIO_TEX, "tex", "undefined", 1, pshader_tex, 0, D3DPS_VERSION(1,3)}, - {D3DSIO_TEX, "texld", GLNAME_REQUIRE_GLSL, 2, pshader_texld, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)}, + {D3DSIO_TEX, "texld", "undefined", 2, pshader_texld, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)}, {D3DSIO_TEX, "texld", GLNAME_REQUIRE_GLSL, 3, pshader_texld, D3DPS_VERSION(2,0), -1}, {D3DSIO_TEXBEM, "texbem", "undefined", 2, pshader_texbem, 0, D3DPS_VERSION(1,3)}, {D3DSIO_TEXBEML, "texbeml", GLNAME_REQUIRE_GLSL, 2, pshader_texbeml, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, @@ -1176,13 +1176,12 @@ inline static VOID IWineD3DPixelShaderIm addline(&lineNum, pgmStr, &pgmLength, tmpLine); ++pToken; } else { - char reg[20]; + char reg2[20]; DWORD reg1 = *pToken & REGMASK; - DWORD reg2 = *++pToken & REGMASK; - if (gen_input_modifier_line(*pToken, 0, reg, tmpLine, This->constants)) { + if (gen_input_modifier_line(*++pToken, 0, reg2, tmpLine, This->constants)) { addline(&lineNum, pgmStr, &pgmLength, tmpLine); } - sprintf(tmpLine,"TEX R%lu%s, %s, texture[%lu], 2D;\n", reg1, tmp, reg, reg2); + sprintf(tmpLine,"TEX R%lu%s, %s, texture[%lu], 2D;\n", reg1, tmp, reg2, reg1); addline(&lineNum, pgmStr, &pgmLength, tmpLine); ++pToken; }

1 0

Ivan Gyurdiev : wined3d: Reorganize shaders code a bit.
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: 8ab0237e2158d6a783c7781bb9aba53b3b442627 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ab0237e2158d6a783c7781… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Apr 11 14:44:03 2006 -0400 wined3d: Reorganize shaders code a bit. --- dlls/wined3d/pixelshader.c | 48 +++++++++----- dlls/wined3d/vertexshader.c | 149 +++++++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8ab0237e2158d6a783c…

1 0

Hans Leidekker : wldap32: Improve error handling in create_page_control().
by Alexandre Julliard April 12, 2006

April 12, 2006

Module: wine Branch: refs/heads/master Commit: cedf0ab45d6e8f3da3aef9d3e9b88cfc0c8fbda2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cedf0ab45d6e8f3da3aef9d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Apr 11 19:49:28 2006 +0200 wldap32: Improve error handling in create_page_control(). --- dlls/wldap32/page.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index ef70057..78012d0 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -39,6 +39,10 @@ #include "winldap_private.h" #include "wldap32.h" +#ifndef LDAP_MAXINT +#define LDAP_MAXINT 2147483647 +#endif + WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** @@ -56,7 +60,8 @@ ULONG ldap_create_page_controlA( WLDAP32 TRACE( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); - if (!ld || !control) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld || !control || pagesize > LDAP_MAXINT) + return WLDAP32_LDAP_PARAM_ERROR; ret = ldap_create_page_controlW( ld, pagesize, cookie, critical, &controlW ); if (ret == LDAP_SUCCESS) @@ -77,6 +82,7 @@ static ULONG create_page_control( ULONG { LDAPControlW *ctrl; BerElement *ber; + ber_tag_t tag; struct berval *berval, null_cookie = { 0, NULL }; INT ret, len; char *val; @@ -85,13 +91,16 @@ static ULONG create_page_control( ULONG if (!ber) return WLDAP32_LDAP_NO_MEMORY; if (cookie) - ber_printf( ber, "{iO}", pagesize, cookie ); + tag = ber_printf( ber, "{iO}", (ber_int_t)pagesize, cookie ); else - ber_printf( ber, "{iO}", pagesize, &null_cookie ); + tag = ber_printf( ber, "{iO}", (ber_int_t)pagesize, &null_cookie ); ret = ber_flatten( ber, &berval ); ber_free( ber, 1 ); + if (tag == LBER_ERROR) + return WLDAP32_LDAP_ENCODING_ERROR; + if (ret == -1) return WLDAP32_LDAP_NO_MEMORY; @@ -146,7 +155,9 @@ ULONG ldap_create_page_controlW( WLDAP32 TRACE( "(%p, 0x%08lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); - if (!ld || !control) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld || !control || pagesize > LDAP_MAXINT) + return WLDAP32_LDAP_PARAM_ERROR; + return create_page_control( pagesize, cookie, critical, control ); #endif

1 0