July 2008 - Wine-commits - list.winehq.org

Adam Petaccia : gdiplus: Implement GdipGetStringFormatFlags.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 2a1d41bf62638ab9a001302e5a0fac4d66fb09cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1d41bf62638ab9a001302e5… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Jul 9 03:33:30 2008 -0400 gdiplus: Implement GdipGetStringFormatFlags. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 11 +++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1e19e38..185354d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -388,7 +388,7 @@ @ stdcall GdipGetSolidFillColor(ptr ptr) @ stdcall GdipGetStringFormatAlign(ptr ptr) @ stub GdipGetStringFormatDigitSubstitution -@ stub GdipGetStringFormatFlags +@ stdcall GdipGetStringFormatFlags(ptr ptr) @ stdcall GdipGetStringFormatHotkeyPrefix(ptr ptr) @ stdcall GdipGetStringFormatLineAlign(ptr ptr) @ stub GdipGetStringFormatMeasurableCharacterRangeCount diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 87aa113..d832ce8 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -79,6 +79,17 @@ GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format, return Ok; } +GpStatus WINGDIPAPI GdipGetStringFormatFlags(GDIPCONST GpStringFormat* format, + INT* flags) +{ + if (!(format && flags)) + return InvalidParameter; + + *flags = format->attr; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat *format, INT *hkpx) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f782ece..0e6518e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -405,6 +405,7 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); +GpStatus WINGDIPAPI GdipGetStringFormatFlags(GDIPCONST GpStringFormat*, INT*); GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*); GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*); GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*);

1 0

Adam Petaccia : gdiplus: Stub GdipStringFormatGetGenericDefault.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: ae817aea09171120c6e7465aa79d485947970503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae817aea09171120c6e7465aa… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Jul 9 03:33:17 2008 -0400 gdiplus: Stub GdipStringFormatGetGenericDefault. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3836b68..1e19e38 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -600,7 +600,7 @@ @ stdcall GdipSetWorldTransform(ptr ptr) @ stdcall GdipShearMatrix(ptr long long long) @ stdcall GdipStartPathFigure(ptr) -@ stub GdipStringFormatGetGenericDefault +@ stdcall GdipStringFormatGetGenericDefault(ptr) @ stub GdipStringFormatGetGenericTypographic @ stub GdipTestControl @ stdcall GdipTransformMatrixPoints(ptr ptr long) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index bd5d6ad..87aa113 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -58,6 +58,16 @@ GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat *format) return Ok; } +GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **format) +{ + if (!format) + return InvalidParameter; + + FIXME("stub: %p\n", format); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format, StringAlignment *align) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 854039c..f782ece 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -403,6 +403,7 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); +GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*); GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*);

1 0

Aric Stewart : coreaudio: Make sure Port_SendToMessageThread is not NULL before calling CFMessagePortSendRequest .
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 686ea70c1853aecc235143862b42e6fb09333ed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=686ea70c1853aecc235143862… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 10 11:28:56 2008 +0900 coreaudio: Make sure Port_SendToMessageThread is not NULL before calling CFMessagePortSendRequest. Prevents crashing when closing audio device during playback. --- dlls/winecoreaudio.drv/audio.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 90d664f..549b69e 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -349,6 +349,9 @@ static void wodSendNotifyCompletionsMessage(WINE_WAVEOUT* wwo) CFDataRef data; UInt32 buffer; + if (!Port_SendToMessageThread) + return; + buffer = (UInt32) wwo->woID; data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)&buffer, sizeof(buffer)); @@ -368,6 +371,9 @@ static void wodSendNotifyInputCompletionsMessage(WINE_WAVEIN* wwi) CFDataRef data; UInt32 buffer; + if (!Port_SendToMessageThread) + return; + buffer = (UInt32) wwi->wiID; data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)&buffer, sizeof(buffer)); @@ -694,6 +700,9 @@ void CoreAudio_WaveRelease(void) /* Stop CFRunLoop in messageThread */ TRACE("()\n"); + if (!Port_SendToMessageThread) + return; + CFMessagePortSendRequest(Port_SendToMessageThread, kStopLoopMessage, NULL, 0.0, 0.0, NULL, NULL); CFRelease(Port_SendToMessageThread); Port_SendToMessageThread = NULL;

1 0

Aric Stewart : winex11: Allow for sane SCIM im processing by processing some filtered KeyRelease events .
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: a4a5a2ec121eeb2a7cd4ffbb5ba7b298f2a050b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a5a2ec121eeb2a7cd4ffbb5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 10 11:29:20 2008 +0900 winex11: Allow for sane SCIM im processing by processing some filtered KeyRelease events. --- dlls/winex11.drv/event.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5b26b71..accd6b4 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -334,7 +334,36 @@ static int process_events( Display *display, Bool (*filter)(), ULONG_PTR arg ) while (XCheckIfEvent( display, &event, filter, (char *)arg )) { count++; - if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ + if (XFilterEvent( &event, None )) + { + /* + * SCIM on linux filters key events strangely. It does not filter the + * KeyPress events for these keys however it does filter the + * KeyRelease events. This causes wine to become very confused as + * to the keyboard state. + * + * We need to let those KeyRelease events be processed so that the + * keyboard state is correct. + */ + if (event.type == KeyRelease) + { + KeySym keysym = 0; + XKeyEvent *keyevent = &event.xkey; + + XLookupString(keyevent, NULL, 0, &keysym, NULL); + if (!(keysym == XK_Shift_L || + keysym == XK_Shift_R || + keysym == XK_Control_L || + keysym == XK_Control_R || + keysym == XK_Alt_R || + keysym == XK_Alt_L || + keysym == XK_Meta_R || + keysym == XK_Meta_L)) + continue; /* not a key we care about, ignore it */ + } + else + continue; /* filtered, ignore it */ + } if (prev_event.type) action = merge_events( &prev_event, &event ); switch( action ) { @@ -523,6 +552,8 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus ); + if (hwnd == GetForegroundWindow()) return; + if (can_activate_window(hwnd)) { /* simulate a mouse click on the caption to find out

1 0

Stefan Dösinger : wined3d: WINED3DRS_SRGBWRITEENABLE-> fragment.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 9086ed2d2ec0392e460793a2527f5c09e921651b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9086ed2d2ec0392e460793a25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 22:07:10 2008 -0500 wined3d: WINED3DRS_SRGBWRITEENABLE->fragment. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ede92d6..47905cb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4018,7 +4018,7 @@ const struct StateEntry FFPStateTable[] = { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }, - { /*194, WINED3DRS_SRGBWRITEENABLE */ STATE_PIXELSHADER, pixelshader }, + { /*194, WINED3DRS_SRGBWRITEENABLE */ STATE_PIXELSHADER, NULL }, { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*196, undefined */ 0, state_undefined }, { /*197, undefined */ 0, state_undefined }, @@ -5450,6 +5450,7 @@ const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG), { STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop }}, { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT), { 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }}, { STATE_PIXELSHADER, { STATE_PIXELSHADER, pixelshader }}, + { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, pixelshader }}, { STATE_RENDER(WINED3DRS_BORDERCOLOR), { STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }}, { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }}, {0 /* Terminate */, { 0, 0 }},

1 0

Stefan Dösinger : wined3d: A few more vertex states.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: c31dfc7d0d852ec9b06b1777033cbef4d44d3b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31dfc7d0d852ec9b06b17770… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 22:11:56 2008 -0500 wined3d: A few more vertex states. --- dlls/wined3d/state.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 47905cb..785d640 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3958,23 +3958,23 @@ const struct StateEntry FFPStateTable[] = { /*133, WINED3DRS_WRAP5 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, - { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, - { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, + { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), NULL }, + { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING), NULL }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_extents }, - { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_ambient }, + { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), NULL }, { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, - { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, - { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), state_localviewer }, - { /*143, WINED3DRS_NORMALIZENORMALS */ STATE_RENDER(WINED3DRS_NORMALIZENORMALS), state_normalize }, + { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), NULL }, + { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), NULL }, + { /*143, WINED3DRS_NORMALIZENORMALS */ STATE_RENDER(WINED3DRS_NORMALIZENORMALS), NULL }, { /*144, WINED3DRS_COLORKEYBLENDENABLE */ STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), state_ckeyblend }, - { /*145, WINED3DRS_DIFFUSEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, - { /*146, WINED3DRS_SPECULARMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, - { /*147, WINED3DRS_AMBIENTMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, - { /*148, WINED3DRS_EMISSIVEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, + { /*145, WINED3DRS_DIFFUSEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), NULL }, + { /*146, WINED3DRS_SPECULARMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), NULL }, + { /*147, WINED3DRS_AMBIENTMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), NULL }, + { /*148, WINED3DRS_EMISSIVEMATERIALSOURCE */ STATE_RENDER(WINED3DRS_COLORVERTEX), NULL }, { /*149, Undefined */ 0, state_undefined }, { /*150, Undefined */ 0, state_undefined }, - { /*151, WINED3DRS_VERTEXBLEND */ STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }, - { /*152, WINED3DRS_CLIPPLANEENABLE */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, + { /*151, WINED3DRS_VERTEXBLEND */ STATE_RENDER(WINED3DRS_VERTEXBLEND), NULL }, + { /*152, WINED3DRS_CLIPPLANEENABLE */ STATE_RENDER(WINED3DRS_CLIPPING), NULL }, { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING */ 0, state_nogl }, { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }, @@ -5309,6 +5309,18 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }}, { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }}, { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }}, + { STATE_RENDER(WINED3DRS_CLIPPING), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }}, + { STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }}, + { STATE_RENDER(WINED3DRS_LIGHTING), { STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }}, + { STATE_RENDER(WINED3DRS_AMBIENT), { STATE_RENDER(WINED3DRS_AMBIENT), state_ambient }}, + { STATE_RENDER(WINED3DRS_COLORVERTEX), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }}, + { STATE_RENDER(WINED3DRS_LOCALVIEWER), { STATE_RENDER(WINED3DRS_LOCALVIEWER), state_localviewer }}, + { STATE_RENDER(WINED3DRS_NORMALIZENORMALS), { STATE_RENDER(WINED3DRS_NORMALIZENORMALS), state_normalize }}, + { STATE_RENDER(WINED3DRS_DIFFUSEMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }}, + { STATE_RENDER(WINED3DRS_SPECULARMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }}, + { STATE_RENDER(WINED3DRS_AMBIENTMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }}, + { STATE_RENDER(WINED3DRS_EMISSIVEMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }}, + { STATE_RENDER(WINED3DRS_VERTEXBLEND), { STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: A few more junk misc states .
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 031ee3e695dd20e6d0532c87184c29e01073b9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031ee3e695dd20e6d0532c871… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 22:16:29 2008 -0500 wined3d: A few more junk misc states. --- dlls/wined3d/state.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=031ee3e695dd20e6d0532…

1 0

Stefan Dösinger : wined3d: texturefactor-> fragment states.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: dd95fce9fbce866020ea1ec92d72f8738bacb43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd95fce9fbce866020ea1ec92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 21:53:51 2008 -0500 wined3d: texturefactor-> fragment states. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 83f5422..88546fe 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3881,7 +3881,7 @@ const struct StateEntry FFPStateTable[] = { /* 57, WINED3DRS_STENCILREF */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, { /* 58, WINED3DRS_STENCILMASK */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, { /* 59, WINED3DRS_STENCILWRITEMASK */ STATE_RENDER(WINED3DRS_STENCILWRITEMASK), NULL }, - { /* 60, WINED3DRS_TEXTUREFACTOR */ STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }, + { /* 60, WINED3DRS_TEXTUREFACTOR */ STATE_RENDER(WINED3DRS_TEXTUREFACTOR), NULL }, { /* 61, Undefined */ 0, state_undefined }, { /* 62, Undefined */ 0, state_undefined }, { /* 63, Undefined */ 0, state_undefined }, @@ -5435,6 +5435,7 @@ const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT), { 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }}, { STATE_PIXELSHADER, { STATE_PIXELSHADER, pixelshader }}, { STATE_RENDER(WINED3DRS_BORDERCOLOR), { STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }}, + { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Wrapping states -> misc.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 0b67a84b4441d256143b542deac88a506dea32e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b67a84b4441d256143b542de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 22:03:41 2008 -0500 wined3d: Wrapping states -> misc. --- dlls/wined3d/state.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 88546fe..ede92d6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3950,14 +3950,14 @@ const struct StateEntry FFPStateTable[] = { /*126, Undefined */ 0, state_undefined }, { /*127, Undefined */ 0, state_undefined }, /* Big hole ends */ - { /*128, WINED3DRS_WRAP0 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*129, WINED3DRS_WRAP1 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*130, WINED3DRS_WRAP2 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*131, WINED3DRS_WRAP3 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*132, WINED3DRS_WRAP4 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*133, WINED3DRS_WRAP5 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*128, WINED3DRS_WRAP0 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*129, WINED3DRS_WRAP1 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*130, WINED3DRS_WRAP2 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*131, WINED3DRS_WRAP3 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*132, WINED3DRS_WRAP4 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*133, WINED3DRS_WRAP5 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_extents }, @@ -4022,14 +4022,14 @@ const struct StateEntry FFPStateTable[] = { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*196, undefined */ 0, state_undefined }, { /*197, undefined */ 0, state_undefined }, - { /*198, WINED3DRS_WRAP8 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*199, WINED3DRS_WRAP9 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*200, WINED3DRS_WRAP10 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*201, WINED3DRS_WRAP11 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*202, WINED3DRS_WRAP12 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*203, WINED3DRS_WRAP13 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*204, WINED3DRS_WRAP14 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*205, WINED3DRS_WRAP15 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*198, WINED3DRS_WRAP8 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*199, WINED3DRS_WRAP9 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*200, WINED3DRS_WRAP10 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*201, WINED3DRS_WRAP11 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*202, WINED3DRS_WRAP12 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*203, WINED3DRS_WRAP13 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*204, WINED3DRS_WRAP14 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*205, WINED3DRS_WRAP15 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, { /*206, WINED3DRS_SEPARATEALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /*207, WINED3DRS_SRCBLENDALPHA */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /*208, WINED3DRS_DESTBLENDALPHA */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, @@ -4957,6 +4957,22 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_CCW_STENCILZFAIL), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, { STATE_RENDER(WINED3DRS_CCW_STENCILPASS), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, { STATE_RENDER(WINED3DRS_CCW_STENCILFUNC), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_WRAP0), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP1), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP2), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP3), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP4), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP5), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP6), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP7), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP8), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP9), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP10), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP11), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP12), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP13), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP14), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP15), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Stencil states -> misc table.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 6fa9f0e363f0d9e8cdc68411cd4235c0eb9da86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa9f0e363f0d9e8cdc68411c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 21:49:53 2008 -0500 wined3d: Stencil states -> misc table. --- dlls/wined3d/state.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f8dfd6f..83f5422 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3873,14 +3873,14 @@ const struct StateEntry FFPStateTable[] = { /* 49, WINED3DRS_ANISOTROPY */ STATE_RENDER(WINED3DRS_ANISOTROPY), NULL }, { /* 50, WINED3DRS_FLUSHBATCH */ STATE_RENDER(WINED3DRS_FLUSHBATCH), NULL }, { /* 51, WINED3DRS_TRANSLUCENTSORTINDEPENDENT */ STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), NULL }, - { /* 52, WINED3DRS_STENCILENABLE */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /* 53, WINED3DRS_STENCILFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /* 54, WINED3DRS_STENCILZFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /* 55, WINED3DRS_STENCILPASS */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /* 56, WINED3DRS_STENCILFUNC */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /* 57, WINED3DRS_STENCILREF */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /* 58, WINED3DRS_STENCILMASK */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /* 59, WINED3DRS_STENCILWRITEMASK */ STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_stencilwrite }, + { /* 52, WINED3DRS_STENCILENABLE */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /* 53, WINED3DRS_STENCILFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /* 54, WINED3DRS_STENCILZFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /* 55, WINED3DRS_STENCILPASS */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /* 56, WINED3DRS_STENCILFUNC */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /* 57, WINED3DRS_STENCILREF */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /* 58, WINED3DRS_STENCILMASK */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /* 59, WINED3DRS_STENCILWRITEMASK */ STATE_RENDER(WINED3DRS_STENCILWRITEMASK), NULL }, { /* 60, WINED3DRS_TEXTUREFACTOR */ STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }, { /* 61, Undefined */ 0, state_undefined }, { /* 62, Undefined */ 0, state_undefined }, @@ -4009,11 +4009,11 @@ const struct StateEntry FFPStateTable[] = { /*182, WINED3DRS_ADAPTIVETESS_Z */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, { /*183, WINED3DRS_ADAPTIVETESS_W */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, { /*184, WINED3DRS_ENABLEADAPTIVETESSELLATION */ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, - { /*185, WINED3DRS_TWOSIDEDSTENCILMODE */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /*186, WINED3DRS_CCW_STENCILFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /*187, WINED3DRS_CCW_STENCILZFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /*188, WINED3DRS_CCW_STENCILPASS */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, - { /*189, WINED3DRS_CCW_STENCILFUNC */ STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, + { /*185, WINED3DRS_TWOSIDEDSTENCILMODE */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /*186, WINED3DRS_CCW_STENCILFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /*187, WINED3DRS_CCW_STENCILZFAIL */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /*188, WINED3DRS_CCW_STENCILPASS */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, + { /*189, WINED3DRS_CCW_STENCILFUNC */ STATE_RENDER(WINED3DRS_STENCILENABLE), NULL }, { /*190, WINED3DRS_COLORWRITEENABLE1 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, @@ -4944,6 +4944,19 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ANISOTROPY), { STATE_RENDER(WINED3DRS_ANISOTROPY), state_anisotropy }}, { STATE_RENDER(WINED3DRS_FLUSHBATCH), { STATE_RENDER(WINED3DRS_FLUSHBATCH), state_flushbatch }}, { STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), { STATE_RENDER(WINED3DRS_TRANSLUCENTSORTINDEPENDENT), state_translucentsi }}, + { STATE_RENDER(WINED3DRS_STENCILENABLE), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_STENCILFAIL), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_STENCILZFAIL), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_STENCILPASS), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_STENCILFUNC), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_STENCILREF), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_STENCILMASK), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_stencilwrite }}, + { STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_CCW_STENCILFAIL), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_CCW_STENCILZFAIL), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_CCW_STENCILPASS), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_CCW_STENCILFUNC), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, {0 /* Terminate */, { 0, 0 }}, };

1 0