wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Henri Verbeet : wined3d: Send clip plane updates through the command stream .
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: db68c43678f28acebafaab1fc3608b3963dcc65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db68c43678f28acebafaab1fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 9 10:39:36 2013 +0200 wined3d: Send clip plane updates through the command stream. --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/device.c | 10 ++-------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 16ffcf9..b6542bc 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -45,6 +45,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_TEXTURE_STATE, WINED3D_CS_OP_SET_SAMPLER_STATE, WINED3D_CS_OP_SET_TRANSFORM, + WINED3D_CS_OP_SET_CLIP_PLANE, }; struct wined3d_cs_present @@ -177,6 +178,13 @@ struct wined3d_cs_set_transform const struct wined3d_matrix *matrix; }; +struct wined3d_cs_set_clip_plane +{ + enum wined3d_cs_op opcode; + UINT plane_idx; + const struct wined3d_vec4 *plane; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -691,6 +699,26 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform cs->ops->submit(cs); } +static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_clip_plane *op = data; + + cs->state.clip_planes[op->plane_idx] = *op->plane; + device_invalidate_state(cs->device, STATE_CLIPPLANE(op->plane_idx)); +} + +void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) +{ + struct wined3d_cs_set_clip_plane *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_CLIP_PLANE; + op->plane_idx = plane_idx; + op->plane = plane; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -712,6 +740,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, /* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state, /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, + /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e37a28d..1f2642b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1734,14 +1734,8 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, device->update_state->clip_planes[plane_idx] = *plane; - /* Handle recording of state blocks. */ - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; - } - - device_invalidate_state(device, STATE_CLIPPLANE(plane_idx)); + if (!device->recording) + wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69738d5..6dc5c7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2485,6 +2485,8 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, + const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer,

1 0

Frédéric Delanoy : winecfg: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 183f00cb6c6c171af5224eed609c625b62615871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183f00cb6c6c171af5224eed6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:18 2013 +0200 winecfg: Use BOOL type where appropriate. --- programs/winecfg/winecfg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index ea116e8..3fbfedf 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #include "winecfg.h" #include "resource.h" -static const int is_win64 = (sizeof(void *) > sizeof(int)); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); HKEY config_key = NULL; HMENU hPopupMenus = 0;

1 0

Frédéric Delanoy : services: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: debd1346b003ae34013a04318e7105f88075c866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=debd1346b003ae34013a04318… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:17 2013 +0200 services: Use BOOL type where appropriate. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 75abf06..37f3d65 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -44,7 +44,7 @@ DWORD service_kill_timeout = 60000; static DWORD default_preshutdown_timeout = 180000; static void *env = NULL; -static const int is_win64 = (sizeof(void *) > sizeof(int)); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static const WCHAR SZ_LOCAL_SYSTEM[] = {'L','o','c','a','l','S','y','s','t','e','m',0};

1 0

Frédéric Delanoy : winspool.drv: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 8afd655a6248c8fe2cbd405ecc1634e4e6fe02d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afd655a6248c8fe2cbd405ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:16 2013 +0200 winspool.drv: Use BOOL type where appropriate. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ed4b314..aebdef9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6877,7 +6877,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW LPWSTR nameW = NULL; DWORD lenA; DWORD len; - DWORD res = FALSE; + BOOL res = FALSE; TRACE("(%s, %d, %p, 0x%x)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags);

1 0

Frédéric Delanoy : winex11.drv: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 387fafd39e2a66dfab0f55c3e44beccf8a916321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387fafd39e2a66dfab0f55c3e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:15 2013 +0200 winex11.drv: Use BOOL type where appropriate. --- dlls/winex11.drv/ime.c | 4 ++-- dlls/winex11.drv/opengl.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 2822f3e..aa6c7dd 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -124,11 +124,11 @@ static BOOL UnlockRealIMC(HIMC hIMC) static void IME_RegisterClasses(void) { - static int done; + static BOOL done = FALSE; WNDCLASSW wndClass; if (done) return; - done = 1; + done = TRUE; ZeroMemory(&wndClass, sizeof(WNDCLASSW)); wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e9a0433..4801bff 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -278,7 +278,7 @@ static struct list context_list = LIST_INIT( context_list ); static struct WineGLInfo WineGLInfo = { 0 }; static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; -static int use_render_texture_emulation = 1; +static BOOL use_render_texture_emulation = TRUE; /* Selects the preferred GLX swap control method for use by wglSwapIntervalEXT */ static enum glx_swap_control_method swap_control_method = GLX_SWAP_CONTROL_NONE; @@ -566,7 +566,7 @@ done: static BOOL has_opengl(void) { - static int init_done; + static BOOL init_done = FALSE; static void *opengl_handle; char buffer[200]; @@ -574,7 +574,7 @@ static BOOL has_opengl(void) unsigned int i; if (init_done) return (opengl_handle != NULL); - init_done = 1; + init_done = TRUE; /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and include all dependencies */ @@ -2420,7 +2420,7 @@ static BOOL X11DRV_wglSetPbufferAttribARB( struct wgl_pbuffer *object, const int SetLastError(ERROR_INVALID_HANDLE); return GL_FALSE; } - if (1 == use_render_texture_emulation) { + if (use_render_texture_emulation) { return GL_TRUE; } return ret; @@ -2829,8 +2829,8 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) return GL_FALSE; } - if (1 == use_render_texture_emulation) { - static int init = 0; + if (use_render_texture_emulation) { + static BOOL initialized = FALSE; int prev_binded_texture = 0; GLXContext prev_context; Drawable prev_drawable; @@ -2843,8 +2843,8 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) This is mostly due to lack of demos/games using them. Further the use of glReadPixels isn't ideal performance wise but I wasn't able to get other ways working. */ - if(!init) { - init = 1; /* Only show the FIXME once for performance reasons */ + if(!initialized) { + initialized = TRUE; /* Only show the FIXME once for performance reasons */ FIXME("partial stub!\n"); } @@ -2885,7 +2885,7 @@ static BOOL X11DRV_wglReleaseTexImageARB( struct wgl_pbuffer *object, int iBuffe SetLastError(ERROR_INVALID_HANDLE); return GL_FALSE; } - if (1 == use_render_texture_emulation) { + if (use_render_texture_emulation) { return GL_TRUE; } return ret;

1 0

Frédéric Delanoy : wineoss.drv: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 10f7f09d4388423e28c01d47635fcdec6b541af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f7f09d4388423e28c01d476… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:14 2013 +0200 wineoss.drv: Use BOOL type where appropriate. --- dlls/wineoss.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 5ab5b0d..c359fe0 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -542,7 +542,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) if (MidiInDev[wDevID].state & 2) { /* system exclusive */ LPMIDIHDR lpMidiHdr; - WORD sbfb = FALSE; + BOOL sbfb = FALSE; EnterCriticalSection(&crit_sect); if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) {

1 0

Frédéric Delanoy : winemac.drv: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 510e30bd63e05c5e36a00d8d397afaa6b64c90a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510e30bd63e05c5e36a00d8d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:13 2013 +0200 winemac.drv: Use BOOL type where appropriate. --- dlls/winemac.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 4749b44..1ae2744 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3048,12 +3048,12 @@ static void load_extensions(void) static BOOL init_opengl(void) { - static int init_done; + static BOOL init_done = FALSE; unsigned int i; char buffer[200]; if (init_done) return (opengl_handle != NULL); - init_done = 1; + init_done = TRUE; TRACE("()\n");

1 0

Frédéric Delanoy : ws2_32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 5274f855e308b45d65b96f571d480746637245ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5274f855e308b45d65b96f571… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:12 2013 +0200 ws2_32/tests: Use BOOL type where appropriate. --- dlls/ws2_32/tests/sock.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 898ecef..9d209e1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1382,7 +1382,8 @@ static void test_ip_pktinfo(void) struct sockaddr_in s1addr, s2addr, s3addr; GUID WSARecvMsg_GUID = WSAID_WSARECVMSG; LPFN_WSARECVMSG pWSARecvMsg = NULL; - unsigned int rc, foundhdr, yes = 1; + unsigned int rc, yes = 1; + BOOL foundhdr; DWORD dwBytes, dwSize, dwFlags; socklen_t addrlen; WSACMSGHDR *cmsg; @@ -3836,7 +3837,7 @@ static void test_ioctlsocket(void) closesocket(sock); } -static int drain_pause=0; +static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { char buffer[1024]; @@ -4664,12 +4665,12 @@ static void test_events(int useMessages) * take some of it, and we will get a short write. This will trigger * another FD_WRITE event as soon as data is sent and more space becomes * available, but not any earlier. */ - drain_pause=1; + drain_pause = TRUE; do { ret = send(src, buffer, bufferSize, 0); } while (ret == bufferSize); - drain_pause=0; + drain_pause = FALSE; if (ret >= 0 || WSAGetLastError() == WSAEWOULDBLOCK) { Sleep(400); /* win9x */

1 0

Akihiro Sagawa : gdi32/tests: Skip linked font like SimSun-ExtB in fixed-pitch font selection.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 0b58ab7ac9f1e6d94a198bdb9cf055ee9472bb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b58ab7ac9f1e6d94a198bdb9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Oct 9 00:12:17 2013 +0900 gdi32/tests: Skip linked font like SimSun-ExtB in fixed-pitch font selection. --- dlls/gdi32/tests/font.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 2343db6..574ebaf 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4009,6 +4009,7 @@ static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, CHARSETINFO csi; LOGFONT lf = *lpelfe; HFONT hfont; + DWORD found_subset; /* skip bitmap, proportional or vertical font */ if ((FontType & TRUETYPE_FONTTYPE) == 0 || @@ -4021,6 +4022,25 @@ static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, (lpntmex->ntmFontSig.fsCsb[0] & csi.fs.fsCsb[0]) == 0) return 1; + /* skip linked font, like SimSun-ExtB */ + switch (lpelfe->lfCharSet) { + case SHIFTJIS_CHARSET: + found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 17); /* Hiragana */ + break; + case GB2312_CHARSET: + case CHINESEBIG5_CHARSET: + found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 16); /* CJK Symbols And Punctuation */ + break; + case HANGEUL_CHARSET: + found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 24); /* Hangul Syllables */ + break; + default: + found_subset = lpntmex->ntmFontSig.fsUsb[0] & (1 << 0); /* Basic Latin */ + break; + } + if (!found_subset) + return 1; + /* test with an odd height */ lf.lfHeight = -19; lf.lfWidth = 0;

1 0

Francois Gouget : testbot: Allow doing a revert while some VMs are running.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: tools Branch: master Commit: d929c00e54a4ae700dd0a8657366d938cecdc0b1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d929c00e54a4ae700dd0a865… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 9 17:39:49 2013 +0200 testbot: Allow doing a revert while some VMs are running. --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 501a530..48eb3f0 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -61,7 +61,7 @@ $DataDir = "$::RootDir/var"; $BinDir = "$::RootDir/bin"; $MaxRevertingVMs = 1; -$MaxRevertsWhileRunningVMs = 0; +$MaxRevertsWhileRunningVMs = 1; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef; $SleepAfterRevert = 30;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013