January 2012 - Wine-Commits

Aric Stewart : usp10: Move GDEF functions to opentype.c.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: bf1ef214e6f131945b84cb8fd91092d5a75e9b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1ef214e6f131945b84cb8fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 4 08:13:41 2012 -0600 usp10: Move GDEF functions to opentype.c. --- dlls/usp10/opentype.c | 146 ++++++++++++++++++++++++++++++++++++++++ dlls/usp10/shape.c | 155 ++----------------------------------------- dlls/usp10/usp10_internal.h | 1 + 3 files changed, 153 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf1ef214e6f131945b84c…

1 0

Aric Stewart : usp10: Move CMAP functions to opentype.c.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 6311ccfe9703e819449ba93b4dfe717dcfda1dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6311ccfe9703e819449ba93b4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 4 08:13:38 2012 -0600 usp10: Move CMAP functions to opentype.c. --- dlls/usp10/Makefile.in | 1 + dlls/usp10/opentype.c | 162 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/shape.c | 114 ------------------------------ dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 2 +- 5 files changed, 165 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6311ccfe9703e819449ba…

1 0

Jörg Höhle : mciseq: Refactor use of mciGetDriverData.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 3ae829d11b38d70244d8e0601e5b32a9313a44ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae829d11b38d70244d8e0601… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 15 22:47:45 2010 +0100 mciseq: Refactor use of mciGetDriverData. --- dlls/mciseq/mcimidi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index e35abc5..e7671d6 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -196,11 +196,11 @@ static DWORD MIDI_drvClose(DWORD dwDevID) /************************************************************************** * MIDI_mciGetOpenDev [internal] */ -static WINE_MCIMIDI* MIDI_mciGetOpenDev(UINT wDevID) +static WINE_MCIMIDI* MIDI_mciGetOpenDev(MCIDEVICEID wDevID, UINT wMsg) { WINE_MCIMIDI* wmm = (WINE_MCIMIDI*)mciGetDriverData(wDevID); - if (wmm == NULL || wmm->nUseCount == 0) { + if (wmm == NULL || ((wmm->nUseCount == 0) ^ (wMsg == MCI_OPEN_DRIVER))) { WARN("Invalid wDevID=%u\n", wDevID); return 0; } @@ -1600,8 +1600,7 @@ LRESULT CALLBACK MCIMIDI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } - wmm = (wMsg == MCI_OPEN_DRIVER) ? - (WINE_MCIMIDI*)mciGetDriverData(dwDevID) : MIDI_mciGetOpenDev(dwDevID); + wmm = MIDI_mciGetOpenDev(dwDevID, wMsg); if (wmm == NULL) return MCIERR_INVALID_DEVICE_ID; switch (wMsg) {

1 0

Jörg Höhle : mciseq: wNotifyDeviceID is redundant .
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 387b359a7eaf1115ac734d18d2f2e36806aba250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387b359a7eaf1115ac734d18d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 15 22:56:08 2010 +0100 mciseq: wNotifyDeviceID is redundant. --- dlls/mciseq/mcimidi.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index e7671d6..2783c07 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -61,7 +61,6 @@ typedef struct tagWINE_MCIMIDI { UINT wDevID; /* the MCI one */ HMIDI hMidi; int nUseCount; /* Incremented for each shared open */ - MCIDEVICEID wNotifyDeviceID; /* MCI device ID with a pending notification */ HANDLE hCallback; /* Callback handle for pending notification */ HMMIO hFile; /* mmio file handle open as Element */ LPWSTR lpstrElementName; /* Name of file (if any) */ @@ -219,7 +218,7 @@ static void MIDI_mciNotify(DWORD_PTR hWndCallBack, WINE_MCIMIDI* wmm, UINT wStat /* We simply save one parameter by not passing the wDevID local * to the command. They are the same (via mciGetDriverData). */ - MCIDEVICEID wDevID = wmm->wNotifyDeviceID; + MCIDEVICEID wDevID = wmm->wDevID; HANDLE old = InterlockedExchangePointer(&wmm->hCallback, NULL); if (old) mciDriverNotify(old, wDevID, MCI_NOTIFY_SUPERSEDED); mciDriverNotify(HWND_32(LOWORD(hWndCallBack)), wDevID, wStatus); @@ -767,7 +766,6 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp wmm->lpstrCopyright = NULL; wmm->lpstrName = NULL; - wmm->wNotifyDeviceID = wmm->wDevID; wmm->dwStatus = MCI_MODE_NOT_READY; /* while loading file contents */ /* spec says it should be the default format from the MIDI file... */ wmm->dwMciTimeFormat = MCI_FORMAT_MILLISECONDS; @@ -1563,11 +1561,8 @@ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpP TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } + if (dwFlags & MCI_NOTIFY) + MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); } return ret; }

1 0

Alexandre Julliard : gdi32/tests: Add some tests for brushed and dashed wide pens.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 4b524f91e2f96b2eb4a275ce071bc367309ff9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b524f91e2f96b2eb4a275ce0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 18:17:05 2012 +0100 gdi32/tests: Add some tests for brushed and dashed wide pens. --- dlls/gdi32/tests/dib.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b524f91e2f96b2eb4a27…

1 0

Aric Stewart : usp10: Add more Microsoft Sans Serif fallbacks.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: ece423b858000d2bd451880229eada1f05671037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece423b858000d2bd45188022… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 14:09:11 2012 -0600 usp10: Add more Microsoft Sans Serif fallbacks. --- dlls/usp10/usp10.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1f6ec53..c26c793 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -307,7 +307,7 @@ const scriptData scriptInformation[] = { {{Script_Latin, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('l','a','t','n'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_CR, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0x00000000, @@ -315,7 +315,7 @@ const scriptData scriptInformation[] = { {{Script_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 1, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0x00000000, - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Control, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 1, 0, 0, ANSI_CHARSET, 1, 0, 0, 0, 0, 0, 1, 0, 0}, 0x00000000, @@ -323,7 +323,7 @@ const scriptData scriptInformation[] = { {{Script_Punctuation, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0x00000000, - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Arabic, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {LANG_ARABIC, 0, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 1, 1, 0}, MS_MAKE_TAG('a','r','a','b'), @@ -351,11 +351,11 @@ const scriptData scriptInformation[] = { {{Script_Greek, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_GREEK, 0, 0, 0, 0, GREEK_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('g','r','e','k'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Cyrillic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_RUSSIAN, 0, 0, 0, 0, RUSSIAN_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','y','r','l'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Armenian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ARMENIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('a','r','m','n'), @@ -483,7 +483,7 @@ const scriptData scriptInformation[] = { {{Script_Punctuation2, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('l','a','t','n'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Numeric2, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 1, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, 0x00000000, @@ -623,7 +623,7 @@ const scriptData scriptInformation[] = { {{Script_Vietnamese_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_VIETNAMESE, 0, 0, 0, 0, VIETNAMESE_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('l','a','t','n'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Thai_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_THAI, 0, 1, 0, 0, THAI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','h','a','i'),

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCULL typedef.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 808e92678398a0b56f2054a27e5e2676194c8aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=808e92678398a0b56f2054a27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:54 2012 +0100 wined3d: Get rid of the WINED3DCULL typedef. --- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a392f1f..c10997c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -129,24 +129,24 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d * offscreen / onscreen rendering switch. */ switch (state->render_states[WINED3D_RS_CULLMODE]) { - case WINED3DCULL_NONE: + case WINED3D_CULL_NONE: glDisable(GL_CULL_FACE); checkGLcall("glDisable GL_CULL_FACE"); break; - case WINED3DCULL_CW: + case WINED3D_CULL_CW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); glCullFace(GL_FRONT); checkGLcall("glCullFace(GL_FRONT)"); break; - case WINED3DCULL_CCW: + case WINED3D_CULL_CCW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); glCullFace(GL_BACK); checkGLcall("glCullFace(GL_BACK)"); break; default: - FIXME("Unrecognized/Unhandled WINED3DCULL value %#x.\n", + FIXME("Unrecognized cull mode %#x.\n", state->render_states[WINED3D_RS_CULLMODE]); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index feabe3d..8da32c2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1133,7 +1133,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_LASTPIXEL] = TRUE; state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE; state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO; - state->render_states[WINED3D_RS_CULLMODE] = WINED3DCULL_CCW; + state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_CCW; state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL; state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_ALPHAREF] = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 312b63c..6c06fc6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -462,13 +462,12 @@ enum wined3d_fill_mode WINED3D_FILL_SOLID = 3, }; -typedef enum _WINED3DCULL +enum wined3d_cull { - WINED3DCULL_NONE = 1, - WINED3DCULL_CW = 2, - WINED3DCULL_CCW = 3, - WINED3DCULL_FORCE_DWORD = 0x7fffffff -} WINED3DCULL; + WINED3D_CULL_NONE = 1, + WINED3D_CULL_CW = 2, + WINED3D_CULL_CCW = 3, +}; typedef enum _WINED3DSTENCILOP {

1 0

Alexandre Julliard : gdi32: Add a helper function for drawing a wide line segment.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: a59c53b312926e5bf1361039e8d79424ffa6d2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59c53b312926e5bf1361039e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 15:50:31 2012 +0100 gdi32: Add a helper function for drawing a wide line segment. --- dlls/gdi32/dibdrv/objects.c | 246 ++++++++++++++++++++++--------------------- 1 files changed, 127 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a59c53b312926e5bf1361…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSTENCILOP typedef.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: fd8597b2bfba7063157bbf2059add9bd675fd777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8597b2bfba7063157bbf205… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:55 2012 +0100 wined3d: Get rid of the WINED3DSTENCILOP typedef. --- dlls/wined3d/state.c | 38 ++++++++++++++++++++++++++++++++------ dlls/wined3d/stateblock.c | 12 ++++++------ dlls/wined3d/utils.c | 19 ------------------- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 21 ++++++++++----------- 5 files changed, 48 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c10997c..a68fae9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -801,6 +801,32 @@ static void renderstate_stencil_twosided(struct wined3d_context *context, GLint checkGLcall("glStencilOp(...)"); } +static GLenum gl_stencil_op(enum wined3d_stencil_op op) +{ + switch (op) + { + case WINED3D_STENCIL_OP_KEEP: + return GL_KEEP; + case WINED3D_STENCIL_OP_ZERO: + return GL_ZERO; + case WINED3D_STENCIL_OP_REPLACE: + return GL_REPLACE; + case WINED3D_STENCIL_OP_INCR_SAT: + return GL_INCR; + case WINED3D_STENCIL_OP_DECR_SAT: + return GL_DECR; + case WINED3D_STENCIL_OP_INVERT: + return GL_INVERT; + case WINED3D_STENCIL_OP_INCR: + return GL_INCR_WRAP_EXT; + case WINED3D_STENCIL_OP_DECR: + return GL_DECR_WRAP_EXT; + default: + FIXME("Unrecognized stencil op %#x.\n", op); + return GL_KEEP; + } +} + static void state_stencil(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -833,12 +859,12 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ func_ccw = GL_ALWAYS; ref = state->render_states[WINED3D_RS_STENCILREF]; mask = state->render_states[WINED3D_RS_STENCILMASK]; - stencilFail = StencilOp(state->render_states[WINED3D_RS_STENCILFAIL]); - depthFail = StencilOp(state->render_states[WINED3D_RS_STENCILZFAIL]); - stencilPass = StencilOp(state->render_states[WINED3D_RS_STENCILPASS]); - stencilFail_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILFAIL]); - depthFail_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILZFAIL]); - stencilPass_ccw = StencilOp(state->render_states[WINED3D_RS_CCW_STENCILPASS]); + stencilFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILFAIL]); + depthFail = gl_stencil_op(state->render_states[WINED3D_RS_STENCILZFAIL]); + stencilPass = gl_stencil_op(state->render_states[WINED3D_RS_STENCILPASS]); + stencilFail_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILFAIL]); + depthFail_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILZFAIL]); + stencilPass_ccw = gl_stencil_op(state->render_states[WINED3D_RS_CCW_STENCILPASS]); TRACE("(onesided %d, twosided %d, ref %x, mask %x, " "GL_FRONT: func: %x, fail %x, zfail %x, zpass %x " diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8da32c2..0f9d07c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1153,9 +1153,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_EDGEANTIALIAS] = FALSE; state->render_states[WINED3D_RS_RANGEFOGENABLE] = FALSE; state->render_states[WINED3D_RS_STENCILENABLE] = FALSE; - state->render_states[WINED3D_RS_STENCILFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_STENCILZFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_STENCILPASS] = WINED3DSTENCILOP_KEEP; + state->render_states[WINED3D_RS_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_STENCILZFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_STENCILPASS] = WINED3D_STENCIL_OP_KEEP; state->render_states[WINED3D_RS_STENCILREF] = 0; state->render_states[WINED3D_RS_STENCILMASK] = 0xffffffff; state->render_states[WINED3D_RS_STENCILFUNC] = WINED3D_CMP_ALWAYS; @@ -1226,9 +1226,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_ADAPTIVETESS_W] = tmpfloat.d; state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION] = FALSE; state->render_states[WINED3D_RS_TWOSIDEDSTENCILMODE] = FALSE; - state->render_states[WINED3D_RS_CCW_STENCILFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_CCW_STENCILZFAIL] = WINED3DSTENCILOP_KEEP; - state->render_states[WINED3D_RS_CCW_STENCILPASS] = WINED3DSTENCILOP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILZFAIL] = WINED3D_STENCIL_OP_KEEP; + state->render_states[WINED3D_RS_CCW_STENCILPASS] = WINED3D_STENCIL_OP_KEEP; state->render_states[WINED3D_RS_CCW_STENCILFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; state->render_states[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a521f4b..2b00765 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2477,25 +2477,6 @@ const char *debug_surflocation(DWORD flag) { return wine_dbg_sprintf("%s", buf[0] ? buf + 3 : "0"); } -/***************************************************************************** - * Useful functions mapping GL <-> D3D values - */ -GLenum StencilOp(DWORD op) { - switch(op) { - case WINED3DSTENCILOP_KEEP : return GL_KEEP; - case WINED3DSTENCILOP_ZERO : return GL_ZERO; - case WINED3DSTENCILOP_REPLACE : return GL_REPLACE; - case WINED3DSTENCILOP_INCRSAT : return GL_INCR; - case WINED3DSTENCILOP_DECRSAT : return GL_DECR; - case WINED3DSTENCILOP_INVERT : return GL_INVERT; - case WINED3DSTENCILOP_INCR : return GL_INCR_WRAP_EXT; - case WINED3DSTENCILOP_DECR : return GL_DECR_WRAP_EXT; - default: - FIXME("Unrecognized stencil op %d\n", op); - return GL_KEEP; - } -} - BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1602bdd..fd21187 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2515,8 +2515,6 @@ const char *debug_d3dtop(WINED3DTEXTUREOP d3dtop) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *debug_surflocation(DWORD flag) DECLSPEC_HIDDEN; -/* Routines for GL <-> D3D values */ -GLenum StencilOp(DWORD op) DECLSPEC_HIDDEN; BOOL is_invalid_op(const struct wined3d_state *state, int stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3) DECLSPEC_HIDDEN; void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6c06fc6..cb09168 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -469,18 +469,17 @@ enum wined3d_cull WINED3D_CULL_CCW = 3, }; -typedef enum _WINED3DSTENCILOP -{ - WINED3DSTENCILOP_KEEP = 1, - WINED3DSTENCILOP_ZERO = 2, - WINED3DSTENCILOP_REPLACE = 3, - WINED3DSTENCILOP_INCRSAT = 4, - WINED3DSTENCILOP_DECRSAT = 5, - WINED3DSTENCILOP_INVERT = 6, - WINED3DSTENCILOP_INCR = 7, - WINED3DSTENCILOP_DECR = 8, - WINED3DSTENCILOP_FORCE_DWORD = 0x7fffffff -} WINED3DSTENCILOP; +enum wined3d_stencil_op +{ + WINED3D_STENCIL_OP_KEEP = 1, + WINED3D_STENCIL_OP_ZERO = 2, + WINED3D_STENCIL_OP_REPLACE = 3, + WINED3D_STENCIL_OP_INCR_SAT = 4, + WINED3D_STENCIL_OP_DECR_SAT = 5, + WINED3D_STENCIL_OP_INVERT = 6, + WINED3D_STENCIL_OP_INCR = 7, + WINED3D_STENCIL_OP_DECR = 8, +}; typedef enum _WINED3DMATERIALCOLORSOURCE {

1 0

Alexandre Julliard : gdi32: Fix skipping of zero-length dashes.
by Alexandre Julliard Jan. 4, 2012

Jan. 4, 2012

Module: wine Branch: master Commit: 618425ac4c405aaa28aa30d787e119ae6c605996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618425ac4c405aaa28aa30d78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 4 14:57:52 2012 +0100 gdi32: Fix skipping of zero-length dashes. --- dlls/gdi32/dibdrv/objects.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index dffea12..ee58192 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -779,7 +779,7 @@ void reset_dash_origin(dibdrv_physdev *pdev) static inline void skip_dash(dibdrv_physdev *pdev, unsigned int skip) { skip %= pdev->pen_pattern.total_len; - while(skip) + do { if(pdev->dash_pos.left_in_dash > skip) { @@ -792,6 +792,7 @@ static inline void skip_dash(dibdrv_physdev *pdev, unsigned int skip) pdev->dash_pos.left_in_dash = pdev->pen_pattern.dashes[pdev->dash_pos.cur_dash]; pdev->dash_pos.mark = !pdev->dash_pos.mark; } + while (skip); } static void dashed_pen_line_callback(dibdrv_physdev *pdev, INT x, INT y)

1 0