December 2008 - Wine-Commits

Rob Shearman : winspool.drv: Use CP_UNIXCP instead of CP_ACP for data that is going to or coming from system library functions .
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: e47495c6e2a090a01160d4872108917b15f035b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47495c6e2a090a01160d4872… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 3 18:24:50 2008 +0000 winspool.drv: Use CP_UNIXCP instead of CP_ACP for data that is going to or coming from system library functions. --- dlls/winspool.drv/info.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6e6b4ad..052ecc1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7603,24 +7603,24 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume #ifdef SONAME_LIBCUPS if(pcupsPrintFile) { - char *unixname, *queue, *doc_titleA; + char *unixname, *queue, *unix_doc_title; DWORD len; BOOL ret; if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; - len = WideCharToMultiByte(CP_ACP, 0, printer_name, -1, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, printer_name, -1, NULL, 0, NULL, NULL); queue = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, printer_name, -1, queue, len, NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, printer_name, -1, queue, len, NULL, NULL); - len = WideCharToMultiByte(CP_ACP, 0, document_title, -1, NULL, 0, NULL, NULL); - doc_titleA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, document_title, -1, doc_titleA, len, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, NULL, 0, NULL, NULL); + unix_doc_title = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, unix_doc_title, len, NULL, NULL); TRACE("printing via cups\n"); - ret = pcupsPrintFile(queue, unixname, doc_titleA, 0, NULL); - HeapFree(GetProcessHeap(), 0, doc_titleA); + ret = pcupsPrintFile(queue, unixname, unix_doc_title, 0, NULL); + HeapFree(GetProcessHeap(), 0, unix_doc_title); HeapFree(GetProcessHeap(), 0, queue); HeapFree(GetProcessHeap(), 0, unixname); return ret; @@ -7739,9 +7739,9 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; - len = WideCharToMultiByte(CP_ACP, 0, cmd, -1, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, NULL, 0, NULL, NULL); cmdA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, cmd, -1, cmdA, len, NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, cmdA, len, NULL, NULL); TRACE("printing with: %s\n", cmdA); @@ -7800,9 +7800,9 @@ static BOOL schedule_unixfile(LPCWSTR output, LPCWSTR filename) if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; - len = WideCharToMultiByte(CP_ACP, 0, output, -1, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, output, -1, NULL, 0, NULL, NULL); outputA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, output, -1, outputA, len, NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, output, -1, outputA, len, NULL, NULL); out_fd = open(outputA, O_CREAT | O_TRUNC | O_WRONLY, 0666); in_fd = open(unixname, O_RDONLY);

1 0

Andrew Talbot : wineoss.drv: Sign-compare warnings fix.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 209fe1ec55bf5fe95e4a79bbfd42c5f900a7b103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209fe1ec55bf5fe95e4a79bbf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 3 17:42:10 2008 +0000 wineoss.drv: Sign-compare warnings fix. --- dlls/wineoss.drv/audio.c | 19 +++++++++++-------- dlls/wineoss.drv/dscapture.c | 2 +- dlls/wineoss.drv/dsrender.c | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index ce56b3a..3a8d3ad 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -701,7 +701,8 @@ static void OSS_Info(int fd) static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) { int rc,arg; - int f,c,r; + int f,c; + unsigned int r; BOOL has_mixer = FALSE; TRACE("(%p) %s\n", ossdev, ossdev->dev_name); @@ -876,7 +877,8 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev) { int rc,arg; - int f,c,r; + int f,c; + unsigned int r; TRACE("(%p) %s\n", ossdev, ossdev->dev_name); if (OSS_OpenDevice(ossdev, O_RDONLY, NULL, 0,-1,-1,-1) != 0) @@ -1004,7 +1006,8 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev) static void OSS_WaveFullDuplexInit(OSS_DEVICE* ossdev) { int rc,arg; - int f,c,r; + int f,c; + unsigned int r; int caps; BOOL has_mixer = FALSE; TRACE("(%p) %s\n", ossdev, ossdev->dev_name); @@ -1149,7 +1152,7 @@ static char* StrDup(const char* str, const char* def) LRESULT OSS_WaveInit(void) { char* str; - int i; + unsigned int i; /* FIXME: Remove unneeded members of WOutDev and WInDev */ TRACE("()\n"); @@ -1172,9 +1175,9 @@ LRESULT OSS_WaveInit(void) for (i = 1; i < MAX_WAVEDRV; ++i) { WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11); - sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%d", i); + sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%u", i); WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13); - sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%d", i); + sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%u", i); } } @@ -1213,13 +1216,13 @@ LRESULT OSS_WaveInit(void) TRACE("%d wave out devices\n", numOutDev); for (i = 0; i < numOutDev; i++) { - TRACE("%d: %s, %s, %s\n", i, WOutDev[i].ossdev.dev_name, + TRACE("%u: %s, %s, %s\n", i, WOutDev[i].ossdev.dev_name, WOutDev[i].ossdev.mixer_name, WOutDev[i].ossdev.interface_name); } TRACE("%d wave in devices\n", numInDev); for (i = 0; i < numInDev; i++) { - TRACE("%d: %s, %s, %s\n", i, WInDev[i].ossdev.dev_name, + TRACE("%u: %s, %s, %s\n", i, WInDev[i].ossdev.dev_name, WInDev[i].ossdev.mixer_name, WInDev[i].ossdev.interface_name); } diff --git a/dlls/wineoss.drv/dscapture.c b/dlls/wineoss.drv/dscapture.c index 6df133a..8849644 100644 --- a/dlls/wineoss.drv/dscapture.c +++ b/dlls/wineoss.drv/dscapture.c @@ -317,7 +317,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions( } if (TRACE_ON(dscapture)) { - int i; + DWORD i; for (i=0;i<howmuch;i++) TRACE("notify at %d to 0x%08lx\n", notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify); diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c index 79aa2ea..de704d0 100644 --- a/dlls/wineoss.drv/dsrender.c +++ b/dlls/wineoss.drv/dsrender.c @@ -303,7 +303,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions( } if (TRACE_ON(wave)) { - int i; + DWORD i; for (i=0;i<howmuch;i++) TRACE("notify at %d to 0x%08lx\n", notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify);

1 0

Alexandre Julliard : gdiplus: Fix the GdipMultiplyMatrix prototype.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 3c32c816215cbe05a254b7c2818691af1957ea4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c32c816215cbe05a254b7c28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:05:31 2008 +0100 gdiplus: Fix the GdipMultiplyMatrix prototype. --- dlls/gdiplus/matrix.c | 2 +- include/gdiplusflat.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index d2e1511..2176da6 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -221,7 +221,7 @@ GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix *matrix, BOOL *res return Ok; } -GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GpMatrix* matrix2, +GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GDIPCONST GpMatrix* matrix2, GpMatrixOrder order) { TRACE("(%p, %p, %d)\n", matrix, matrix2, order); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ef6ba7d..3219cb0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -388,7 +388,7 @@ GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix*, BOOL*); -GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); +GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GDIPCONST GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);

1 0

Nikolay Sivov : gdiplus: Added GdipGetPenFillType.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 9f25eb35b75129beeffc85dcd588a34cad66fb6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f25eb35b75129beeffc85dcd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 3 18:22:55 2008 +0300 gdiplus: Added GdipGetPenFillType. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 30 ++++++++++++++++++++++++++ dlls/gdiplus/tests/pen.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 11 +++++++++ include/gdiplusflat.h | 1 + include/gdiplusgpstubs.h | 1 + 6 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1dce580..b5a5aab 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -360,7 +360,7 @@ @ stdcall GdipGetPenDashOffset(ptr ptr) @ stdcall GdipGetPenDashStyle(ptr ptr) @ stdcall GdipGetPenEndCap(ptr ptr) -@ stub GdipGetPenFillType +@ stdcall GdipGetPenFillType(ptr ptr) @ stdcall GdipGetPenLineJoin(ptr ptr) @ stdcall GdipGetPenMiterLimit(ptr ptr) @ stdcall GdipGetPenMode(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 61f1898..2804b14 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -67,6 +67,24 @@ static DWORD gdip_to_gdi_join(GpLineJoin join) } } +static GpPenType bt_to_pt(GpBrushType bt) +{ + switch(bt){ + case BrushTypeSolidColor: + return PenTypeSolidColor; + case BrushTypeHatchFill: + return PenTypeHatchFill; + case BrushTypeTextureFill: + return PenTypeTextureFill; + case BrushTypePathGradient: + return PenTypePathGradient; + case BrushTypeLinearGradient: + return PenTypeLinearGradient; + default: + return PenTypeUnknown; + } +} + GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) { TRACE("(%p, %p)\n", pen, clonepen); @@ -283,6 +301,18 @@ GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen *pen, GpLineCap *endCap) return Ok; } +GpStatus WINGDIPAPI GdipGetPenFillType(GpPen *pen, GpPenType* type) +{ + TRACE("(%p, %p)\n", pen, type); + + if(!pen || !type) + return InvalidParameter; + + *type = bt_to_pt(pen->brush->bt); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen *pen, GpLineJoin *lineJoin) { TRACE("(%p, %p)\n", pen, lineJoin); diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index d75e510..263d0a7 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -275,6 +275,56 @@ static void test_customcap(void) GdipDeletePen(pen); } +static void test_penfilltype(void) +{ + GpPen *pen; + GpSolidFill *solid; + GpLineGradient *line; + GpPointF a, b; + GpStatus status; + GpPenType type; + + /* NULL */ + status = GdipGetPenFillType(NULL, NULL); + expect(InvalidParameter, status); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + status = GdipGetPenFillType(pen, NULL); + expect(InvalidParameter, status); + + /* created with GdipCreatePen1() */ + status = GdipGetPenFillType(pen, &type); + expect(Ok, status); + expect(PenTypeSolidColor, type); + GdipDeletePen(pen); + + /* based on SolidBrush */ + status = GdipCreateSolidFill((ARGB)0xffff00ff, &solid); + expect(Ok, status); + status = GdipCreatePen2((GpBrush*)solid, 10.0f, UnitPixel, &pen); + expect(Ok, status); + status = GdipGetPenFillType(pen, &type); + expect(Ok, status); + expect(PenTypeSolidColor, type); + GdipDeletePen(pen); + GdipDeleteBrush((GpBrush*)solid); + + /* based on LinearGradientBrush */ + a.X = a.Y = 0.0; + b.X = b.Y = 10.0; + status = GdipCreateLineBrush(&a, &b, (ARGB)0xffff00ff, (ARGB)0xffff0000, + WrapModeTile, &line); + expect(Ok, status); + status = GdipCreatePen2((GpBrush*)line, 10.0f, UnitPixel, &pen); + expect(Ok, status); + status = GdipGetPenFillType(pen, &type); + expect(Ok, status); + expect(PenTypeLinearGradient, type); + GdipDeletePen(pen); + GdipDeleteBrush((GpBrush*)line); +} + START_TEST(pen) { struct GdiplusStartupInput gdiplusStartupInput; @@ -294,6 +344,7 @@ START_TEST(pen) test_brushfill(); test_dasharray(); test_customcap(); + test_penfilltype(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 3138b8c..8f7470d 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -76,6 +76,16 @@ enum PathPointType{ PathPointTypeBezier3 = 3 }; +enum PenType +{ + PenTypeSolidColor = BrushTypeSolidColor, + PenTypeHatchFill = BrushTypeHatchFill, + PenTypeTextureFill = BrushTypeTextureFill, + PenTypePathGradient = BrushTypePathGradient, + PenTypeLinearGradient = BrushTypeLinearGradient, + PenTypeUnknown = -1 +}; + enum LineJoin { LineJoinMiter = 0, @@ -384,6 +394,7 @@ typedef enum FlushIntention FlushIntention; typedef enum CoordinateSpace CoordinateSpace; typedef enum GpTestControlEnum GpTestControlEnum; typedef enum MetafileFrameUnit MetafileFrameUnit; +typedef enum PenType PenType; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ea4bec5..ef6ba7d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -487,6 +487,7 @@ GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen*,GpDashCap); GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap); +GpStatus WINGDIPAPI GdipGetPenFillType(GpPen*,GpPenType*); GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap); GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); GpStatus WINGDIPAPI GdipSetPenMode(GpPen*,GpPenAlignment); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index e1d1706..a768638 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -90,5 +90,6 @@ typedef WrapMode GpWrapMode; typedef Color GpColor; typedef FlushIntention GpFlushIntention; typedef CoordinateSpace GpCoordinateSpace; +typedef PenType GpPenType; #endif

1 0

Henri Verbeet : wined3d: Get rid of vcheckGLcall.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 74acbf9c16f30578a41a746d798af72d3d8b502d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74acbf9c16f30578a41a746d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 14:53:44 2008 +0100 wined3d: Get rid of vcheckGLcall. Everywhere it's used a regular checkGLcall will do just as well. --- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/surface.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 15 --------------- 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b02481..6c8e273 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4264,9 +4264,9 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const WineDirect3 WINED3D_ATR_GLTYPE(sd->u.s.specular.dwType), sd->u.s.specular.dwStride, sd->u.s.specular.lpData + stateblock->loadBaseVertexIndex * sd->u.s.specular.dwStride + offset[sd->u.s.specular.streamNo]); - vcheckGLcall("glSecondaryColorPointerEXT(4, GL_UNSIGNED_BYTE, ...)"); + checkGLcall("glSecondaryColorPointerEXT(4, GL_UNSIGNED_BYTE, ...)"); glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); - vcheckGLcall("glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT)"); + checkGLcall("glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT)"); } else { /* Missing specular color is not critical, no warnings */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3e72ad6..0191403 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -796,7 +796,7 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v local_rect.right - local_rect.left, local_rect.bottom - local_rect.top, fmt, type, mem); - vcheckGLcall("glReadPixels"); + checkGLcall("glReadPixels"); if(This->Flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); @@ -959,7 +959,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) checkGLcall("glCopyTexSubImage2D"); glReadBuffer(prevRead); - vcheckGLcall("glReadBuffer"); + checkGLcall("glReadBuffer"); LEAVE_GL(); TRACE("Updated target %d\n", This->glDescription.target); @@ -1207,18 +1207,18 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm } glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store); - vcheckGLcall("glIntegerv"); + checkGLcall("glIntegerv"); glGetIntegerv(GL_CURRENT_RASTER_POSITION, &prev_rasterpos[0]); - vcheckGLcall("glIntegerv"); + checkGLcall("glIntegerv"); glPixelZoom(1.0, -1.0); - vcheckGLcall("glPixelZoom"); + checkGLcall("glPixelZoom"); /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ glGetIntegerv(GL_UNPACK_ROW_LENGTH, &skipBytes); glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width); glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); - vcheckGLcall("glRasterPos2f"); + checkGLcall("glRasterPos2f"); /* Some drivers(radeon dri, others?) don't like exceptions during * glDrawPixels. If the surface is a DIB section, it might be in GDIMode @@ -1261,14 +1261,14 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm } glPixelZoom(1.0,1.0); - vcheckGLcall("glPixelZoom"); + checkGLcall("glPixelZoom"); glRasterPos3iv(&prev_rasterpos[0]); - vcheckGLcall("glRasterPos3iv"); + checkGLcall("glRasterPos3iv"); /* Reset to previous pack row length */ glPixelStorei(GL_UNPACK_ROW_LENGTH, skipBytes); - vcheckGLcall("glPixelStorei GL_UNPACK_ROW_LENGTH"); + checkGLcall("glPixelStorei GL_UNPACK_ROW_LENGTH"); if(!swapchain) { glDrawBuffer(myDevice->offscreenBuffer); @@ -2354,9 +2354,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, c NULL); glGetIntegerv(GL_READ_BUFFER, &prevRead); - vcheckGLcall("glGetIntegerv"); + checkGLcall("glGetIntegerv"); glReadBuffer(swapChain ? GL_BACK : This->resource.wineD3DDevice->offscreenBuffer); - vcheckGLcall("glReadBuffer"); + checkGLcall("glReadBuffer"); glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, @@ -2775,7 +2775,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } } } - vcheckGLcall("glCopyTexSubImage2D"); + checkGLcall("glCopyTexSubImage2D"); LEAVE_GL(); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36ba563..a672864 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -576,21 +576,6 @@ extern const float identity[16]; # define VTRACE(A) #endif -/* Checking of per-vertex related GL calls */ -/* --------------------- */ -#define vcheckGLcall(A) \ -do { \ - GLint err = glGetError(); \ - if (err == GL_NO_ERROR) { \ - VTRACE(("%s call ok %s / %d\n", A, __FILE__, __LINE__)); \ - \ - } else do { \ - FIXME(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ - debug_glerror(err), err, A, __FILE__, __LINE__); \ - err = glGetError(); \ - } while (err != GL_NO_ERROR); \ -} while(0) - /* TODO: Confirm each of these works when wined3d move completed */ #if 0 /* NOTE: Must be 0 in cvs */ /* To avoid having to get gigabytes of trace, the following can be compiled in, and at the start

1 0

Stefan Dösinger : wined3d: Fix D3DFMT_R32F, R16F, G16R16F, ... in the pixel shader.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: e04556bb166804edc5c6cb16e6001b25aab9563e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04556bb166804edc5c6cb16e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 3 14:53:43 2008 +0100 wined3d: Fix D3DFMT_R32F, R16F, G16R16F, ... in the pixel shader. This allows us to drop the load time conversion and the clear readback hack and replaces it with a color fixup in the fixed function pipeline replacement. --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/surface.c | 130 ---------------------------------------- dlls/wined3d/utils.c | 20 ++++++ dlls/wined3d/wined3d_private.h | 3 - 4 files changed, 21 insertions(+), 134 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 32031e4..d9399fe 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8679,7 +8679,7 @@ struct formats { }; const struct formats test_formats[] = { - { "D3DFMT_G16R16", D3DFMT_G16R16, 0x00181800, 0x002010ff}, + { "D3DFMT_G16R16", D3DFMT_G16R16, 0x001818ff, 0x002010ff}, { "D3DFMT_R16F", D3DFMT_R16F, 0x0018ffff, 0x0020ffff }, { "D3DFMT_G16R16F", D3DFMT_G16R16F, 0x001818ff, 0x002010ff }, { "D3DFMT_A16B16G16R16F", D3DFMT_A16B16G16R16F, 0x00181800, 0x00201000 }, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b34ab49..3e72ad6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,7 +36,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert); -static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); static void surface_remove_pbo(IWineD3DSurfaceImpl *This); void surface_force_reload(IWineD3DSurface *iface) @@ -945,8 +944,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) This->pow2Height, format, type); } - clear_unused_channels(This); - ENTER_GL(); /* If !SrcIsUpsideDown we should flip the surface. * This can be done using glCopyTexSubImage2D but this @@ -1703,38 +1700,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 2; break; - case WINED3DFMT_R32F: - /* Can be loaded in theory with fmt=GL_RED, type=GL_FLOAT, but this fails. The reason - * is that D3D expects the undefined green, blue and alpha channels to return 1.0 - * when sampling, but OpenGL sets green and blue to 0.0 instead. Thus we have to inject - * 1.0 instead. - * - * The alpha channel defaults to 1.0 in opengl, so nothing has to be done about it. - */ - *convert = CONVERT_R32F; - *format = GL_RGB; - *internal = GL_RGB32F_ARB; - *type = GL_FLOAT; - *target_bpp = 12; - break; - - case WINED3DFMT_R16F: - /* Similar to R32F */ - *convert = CONVERT_R16F; - *format = GL_RGB; - *internal = GL_RGB16F_ARB; - *type = GL_HALF_FLOAT_ARB; - *target_bpp = 6; - break; - - case WINED3DFMT_G16R16: - *convert = CONVERT_G16R16; - *format = GL_RGB; - *internal = GL_RGB16_EXT; - *type = GL_UNSIGNED_SHORT; - *target_bpp = 6; - break; - default: break; } @@ -2062,66 +2027,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_R32F: - { - unsigned int x, y; - const float *Source; - float *Dest; - for(y = 0; y < height; y++) { - Source = (const float *)(src + y * pitch); - Dest = (float *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - float color = (*Source++); - Dest[0] = color; - Dest[1] = 1.0; - Dest[2] = 1.0; - Dest += 3; - } - } - break; - } - - case CONVERT_R16F: - { - unsigned int x, y; - const WORD *Source; - WORD *Dest; - const WORD one = 0x3c00; - for(y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD color = (*Source++); - Dest[0] = color; - Dest[1] = one; - Dest[2] = one; - Dest += 3; - } - } - break; - } - - case CONVERT_G16R16: - { - unsigned int x, y; - const WORD *Source; - WORD *Dest; - - for(y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD green = (*Source++); - WORD red = (*Source++); - Dest[0] = green; - Dest[1] = red; - Dest[2] = 0xffff; - Dest += 3; - } - } - break; - } - default: ERR("Unsupported conversation type %d\n", convert); } @@ -2273,41 +2178,6 @@ BOOL palette9_changed(IWineD3DSurfaceImpl *This) { return TRUE; } -static inline void clear_unused_channels(IWineD3DSurfaceImpl *This) { - GLboolean oldwrite[4]; - - /* Some formats have only some color channels, and the others are 1.0. - * since our rendering renders to all channels, and those pixel formats - * are emulated by using a full texture with the other channels set to 1.0 - * manually, clear the unused channels. - * - * This could be done with hacking colorwriteenable to mask the colors, - * but before drawing the buffer would have to be cleared too, so there's - * no gain in that - */ - switch(This->resource.format) { - case WINED3DFMT_R16F: - case WINED3DFMT_R32F: - TRACE("R16F or R32F format, clearing green, blue and alpha to 1.0\n"); - /* Do not activate a context, the correct drawable is active already - * though just the read buffer is set, make sure to have the correct draw - * buffer too - */ - glDrawBuffer(This->resource.wineD3DDevice->offscreenBuffer); - glDisable(GL_SCISSOR_TEST); - glGetBooleanv(GL_COLOR_WRITEMASK, oldwrite); - glColorMask(GL_FALSE, GL_TRUE, GL_TRUE, GL_TRUE); - glClearColor(0.0, 1.0, 1.0, 1.0); - glClear(GL_COLOR_BUFFER_BIT); - glColorMask(oldwrite[0], oldwrite[1], oldwrite[2], oldwrite[3]); - if(!This->resource.wineD3DDevice->render_offscreen) glDrawBuffer(GL_BACK); - checkGLcall("Unused channel clear\n"); - break; - - default: break; - } -} - static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BOOL srgb_mode) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cd7ff06..fd4f4ee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -363,6 +363,26 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) } } + dst = getFmtIdx(WINED3DFMT_R16F); + gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + + dst = getFmtIdx(WINED3DFMT_R32F); + gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + + dst = getFmtIdx(WINED3DFMT_G16R16); + gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + + dst = getFmtIdx(WINED3DFMT_G16R16F); + gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + + dst = getFmtIdx(WINED3DFMT_G32R32F); + gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + /* V8U8 is supported natively by GL_ATI_envmap_bumpmap and GL_NV_texture_shader. * V16U16 is only supported by GL_NV_texture_shader. The formats need fixup if * their extensions are not available. GL_ATI_envmap_bumpmap is not used because diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2aa74e7..36ba563 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1693,9 +1693,6 @@ typedef enum { CONVERT_Q8W8V8U8, CONVERT_V16U16, CONVERT_A4L4, - CONVERT_R32F, - CONVERT_R16F, - CONVERT_G16R16, } CONVERT_TYPES; HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode);

1 0

Henri Verbeet : wined3d: Make shader texture format fixups more generic.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 89139b75898fb5ac7094a641b0d91a06936a6c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89139b75898fb5ac7094a641b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 14:53:43 2008 +0100 wined3d: Make shader texture format fixups more generic. Based on a patch by Stefan Dösinger. This is more flexible, and allows the shader backend implementation to be simpler, since it doesn't have to know about specific formats. The next patch makes use of this. --- dlls/wined3d/arb_program_shader.c | 468 +++++++++++++-------------------- dlls/wined3d/ati_fragment_shader.c | 58 +++-- dlls/wined3d/baseshader.c | 98 ++++++-- dlls/wined3d/device.c | 6 +- dlls/wined3d/directx.c | 53 ++--- dlls/wined3d/glsl_shader.c | 297 ++++++++-------------- dlls/wined3d/nvidia_texture_shader.c | 22 ++- dlls/wined3d/pixelshader.c | 6 +- dlls/wined3d/state.c | 20 ++- dlls/wined3d/surface.c | 21 ++- dlls/wined3d/utils.c | 100 ++++++-- dlls/wined3d/wined3d_private.h | 126 ++++++++-- 12 files changed, 686 insertions(+), 589 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89139b75898fb5ac7094a…

1 0

Henri Verbeet : wined3d: Move GlPixelFormatDesc to wined3d_private. h where it belongs.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: b451048eb77e618cf22ebc6dd08581507a456c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b451048eb77e618cf22ebc6dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 14:53:42 2008 +0100 wined3d: Move GlPixelFormatDesc to wined3d_private.h where it belongs. Also remove the silly typedef. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_gl.h | 9 +-------- dlls/wined3d/wined3d_private.h | 15 ++++++++++++++- 10 files changed, 38 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b451048eb77e618cf22eb…

1 0

Henri Verbeet : wined3d: Remove sampled_format from IWineD3DBaseShaderClass , it isn't used anywhere.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 9f2fa8ba256f8c48f1ccbf4f498c2a2729178c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2fa8ba256f8c48f1ccbf4f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 3 14:53:43 2008 +0100 wined3d: Remove sampled_format from IWineD3DBaseShaderClass, it isn't used anywhere. --- dlls/wined3d/arb_program_shader.c | 1 - dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/wined3d_private.h | 6 ------ 3 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 051f71b..44c302b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -807,7 +807,6 @@ static void shader_arb_color_correction(const SHADER_OPCODE_ARG* arg) if(!recorded) { shader->baseShader.sampled_samplers[shader->baseShader.num_sampled_samplers] = sampler_idx; shader->baseShader.num_sampled_samplers++; - shader->baseShader.sampled_format[sampler_idx] = conversion_group; } pshader_get_register_name(arg->shader, arg->dst, reg); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7e9353c..11f48ed 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1228,7 +1228,6 @@ static void shader_glsl_color_correction(const SHADER_OPCODE_ARG *arg) if(!recorded) { shader->baseShader.sampled_samplers[shader->baseShader.num_sampled_samplers] = sampler_idx; shader->baseShader.num_sampled_samplers++; - shader->baseShader.sampled_format[sampler_idx] = conversion_group; } switch(fmt) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d3ac5ca..931f9b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2132,12 +2132,6 @@ typedef struct IWineD3DBaseShaderClass struct list constantsI; shader_reg_maps reg_maps; - /* Pixel formats of sampled textures, for format conversion. This - * represents the formats found during compilation, it is not initialized - * on the first parser pass. It is needed to check if the shader - * needs recompilation to adjust the format conversion - */ - WINED3DFORMAT sampled_format[MAX_COMBINED_SAMPLERS]; UINT sampled_samplers[MAX_COMBINED_SAMPLERS]; UINT num_sampled_samplers;

1 0

Alexandre Julliard : winebuild: Don' t add stdcall decorations on non-x86 platforms.
by Alexandre Julliard Dec. 4, 2008

Dec. 4, 2008

Module: wine Branch: master Commit: 9f1cf1c26358987e0dfe1ef14119ea02954084ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1cf1c26358987e0dfe1ef14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 22:37:07 2008 +0100 winebuild: Don't add stdcall decorations on non-x86 platforms. --- tools/winebuild/spec32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index afcc7da..276639e 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -561,7 +561,7 @@ void BuildDef32File( DLLSPEC *spec ) case TYPE_STDCALL: { int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); - if (!kill_at) output( "@%d", at_param ); + if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { output( "=%s", odp->link_name ); @@ -569,7 +569,7 @@ void BuildDef32File( DLLSPEC *spec ) else if (strcmp(name, odp->link_name)) /* try to reduce output */ { output( "=%s", odp->link_name ); - if (!kill_at) output( "@%d", at_param ); + if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); } break; }

1 0