winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
737 discussions
Start a n
N
ew thread
André Hentschel : winspool.drv: Also convert printer info for level 8.
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: 0cf0c28d168ffdb084b6a28386cfe6b667b755dd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0cf0c28d168ffdb084b6a2838…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 3 22:40:09 2012 +0200 winspool.drv: Also convert printer info for level 8. --- dlls/winspool.drv/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 297cf7a..33caaad 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1389,6 +1389,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW, break; } + case 8: case 9: { PRINTER_INFO_9W * piW = (PRINTER_INFO_9W *) pPrintersW;
1
0
0
0
Henri Verbeet : wined3d: Properly check for transformed position in buffer_check_attribute().
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: a331ed032e0a22ae720205f3576e9d5a21e7bfb9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a331ed032e0a22ae720205f35…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:39 2012 +0200 wined3d: Properly check for transformed position in buffer_check_attribute(). --- dlls/wined3d/buffer.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e4f3668..0ee814b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -302,8 +302,14 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win if (!is_ffp_color) FIXME("Test for non-color fixed function WINED3DFMT_B8G8R8A8_UNORM format\n"); } - else if (is_ffp_position && format == WINED3DFMT_R32G32B32A32_FLOAT) + else if (is_ffp_position && si->position_transformed) { + if (format != WINED3DFMT_R32G32B32A32_FLOAT) + { + FIXME("Unexpected format %s for transformed position.\n", debug_d3dformat(format)); + return FALSE; + } + ret = buffer_process_converted_attribute(This, CONV_POSITIONT, attrib, stride_this_run); } else if (This->conversion_map)
1
0
0
0
Henri Verbeet : wined3d: Use the wined3d_matrix structure for the identity matrix.
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: 6b9018ccd23f44a23b3e1038bde4ad7c280cf1ff URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6b9018ccd23f44a23b3e1038b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:38 2012 +0200 wined3d: Use the wined3d_matrix structure for the identity matrix. --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c659e47..fcf5595 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -52,13 +52,13 @@ const struct wined3d_light WINED3D_default_light = /********************************************************** * Global variable / Constants follow **********************************************************/ -const float identity[] = -{ +const struct wined3d_matrix identity = +{{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, -}; /* When needed for comparisons */ +}}}; /* When needed for comparisons */ /* Note that except for WINED3DPT_POINTLIST and WINED3DPT_LINELIST these * actually have the same values in GL and D3D. */ @@ -1832,7 +1832,7 @@ HRESULT CDECL wined3d_device_set_transform(struct wined3d_device *device, * matrix. The Projection matrix stay projection matrix. */ if (d3dts == WINED3D_TS_VIEW) - device->view_ident = !memcmp(matrix, identity, 16 * sizeof(float)); + device->view_ident = !memcmp(matrix, &identity, sizeof(identity)); if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends)) device_invalidate_state(device, STATE_TRANSFORM(d3dts)); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 304a326..9544c6f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1108,11 +1108,11 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); /* Set some of the defaults for lights, transforms etc */ - memcpy(&state->transforms[WINED3D_TS_PROJECTION], identity, sizeof(identity)); - memcpy(&state->transforms[WINED3D_TS_VIEW], identity, sizeof(identity)); + memcpy(&state->transforms[WINED3D_TS_PROJECTION], &identity, sizeof(identity)); + memcpy(&state->transforms[WINED3D_TS_VIEW], &identity, sizeof(identity)); for (i = 0; i < 256; ++i) { - memcpy(&state->transforms[WINED3D_TS_WORLD_MATRIX(i)], identity, sizeof(identity)); + memcpy(&state->transforms[WINED3D_TS_WORLD_MATRIX(i)], &identity, sizeof(identity)); } state->fb = &device->fb; @@ -1253,7 +1253,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) for (i = 0; i < MAX_TEXTURES; ++i) { TRACE("Setting up default texture states for texture Stage %u.\n", i); - memcpy(&state->transforms[WINED3D_TS_TEXTURE0 + i], identity, sizeof(identity)); + memcpy(&state->transforms[WINED3D_TS_TEXTURE0 + i], &identity, sizeof(identity)); state->texture_states[i][WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE; state->texture_states[i][WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE; state->texture_states[i][WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 976c4f4..6a78b65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -860,7 +860,7 @@ do { debug_d3dformat(si->elements[name].format->id), si->elements[name].stream_idx); } while(0) /* Global variables */ -extern const float identity[16] DECLSPEC_HIDDEN; +extern const struct wined3d_matrix identity DECLSPEC_HIDDEN; enum wined3d_ffp_idx {
1
0
0
0
Henri Verbeet : d3d8: Get rid of IDirect3D8Impl.
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: e103a7a52df928e2eec811bf8d12f9931c8c7d80 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e103a7a52df928e2eec811bf8…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:37 2012 +0200 d3d8: Get rid of IDirect3D8Impl. --- dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d8/d3d8_private.h | 16 +-- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 272 ++++++++++++++++++++++------------------------ 4 files changed, 139 insertions(+), 153 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=e103a7a52df928e2eec81…
1
0
0
0
Henri Verbeet : d3d8: Add a separate function for d3d8 initialization.
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: 5a4c15b9d96cda9e8252d1b8d06a4b1bb4ccd346 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5a4c15b9d96cda9e8252d1b8d…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:36 2012 +0200 d3d8: Add a separate function for d3d8 initialization. --- dlls/d3d8/d3d8_main.c | 32 ++++++++++++++++---------------- dlls/d3d8/d3d8_private.h | 15 ++------------- dlls/d3d8/directx.c | 16 +++++++++++++++- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 46f6a5c..1dd7af1 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -35,27 +35,27 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { - IDirect3D8Impl* object; - TRACE("SDKVersion = %x\n", SDKVersion); - - wined3d_mutex_lock(); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D8Impl)); - - object->IDirect3D8_iface.lpVtbl = &Direct3D8_Vtbl; - object->ref = 1; - object->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS); +IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) +{ + IDirect3D8Impl *object; - TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); + TRACE("sdk_version %#x.\n", sdk_version); - wined3d_mutex_unlock(); + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate d3d8 object memory.\n"); + return NULL; + } - if (!object->WineD3D) + if (!d3d8_init(object)) { - HeapFree( GetProcessHeap(), 0, object ); - object = NULL; + WARN("Failed to initialize d3d8.\n"); + HeapFree(GetProcessHeap(), 0, object); + return NULL; } + + TRACE("Created d3d8 object %p.\n", object); + return &object->IDirect3D8_iface; } diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index b963abe..6b18c1e 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -110,19 +110,6 @@ typedef struct IDirect3DSwapChain8Impl IDirect3DSwapChain8Impl; typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl; typedef struct IDirect3DVertexBuffer8Impl IDirect3DVertexBuffer8Impl; -/* =========================================================================== - The interfaces themselves - =========================================================================== */ - -/* ---------- */ -/* IDirect3D8 */ -/* ---------- */ - -/***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3D8Vtbl Direct3D8_Vtbl DECLSPEC_HIDDEN; - /***************************************************************************** * IDirect3D implementation structure */ @@ -133,6 +120,8 @@ struct IDirect3D8Impl struct wined3d *WineD3D; }; +BOOL d3d8_init(IDirect3D8Impl *d3d8) DECLSPEC_HIDDEN; + /***************************************************************************** * IDirect3DDevice8 implementation structure */ diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 1debd8f..90ca96d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -378,7 +378,7 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(IDirect3D8 *iface, UINT adapte return D3D_OK; } -const IDirect3D8Vtbl Direct3D8_Vtbl = +static const struct IDirect3D8Vtbl Direct3D8_Vtbl = { /* IUnknown */ IDirect3D8Impl_QueryInterface, @@ -399,3 +399,17 @@ const IDirect3D8Vtbl Direct3D8_Vtbl = IDirect3D8Impl_GetAdapterMonitor, IDirect3D8Impl_CreateDevice }; + +BOOL d3d8_init(IDirect3D8Impl *d3d8) +{ + d3d8->IDirect3D8_iface.lpVtbl = &Direct3D8_Vtbl; + d3d8->ref = 1; + + wined3d_mutex_lock(); + d3d8->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS); + wined3d_mutex_unlock(); + if (!d3d8->WineD3D) + return FALSE; + + return TRUE; +}
1
0
0
0
Henri Verbeet : ddraw: Get rid of the member_info typedef.
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: 0f9ccac447dc2930014c2860f0ca89d9800b8933 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0f9ccac447dc2930014c2860f…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:35 2012 +0200 ddraw: Get rid of the member_info typedef. --- dlls/ddraw/ddraw_private.h | 6 ++-- dlls/ddraw/utils.c | 58 ++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index cc608bb..0688d07 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -571,13 +571,13 @@ struct flag_info #define FE(x) { x, #x } -typedef struct +struct member_info { DWORD val; - const char* name; + const char *name; void (*func)(const void *); ptrdiff_t offset; -} member_info; +}; /* Structure copy */ #define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) } diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 013bd73..d990440 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -740,11 +740,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagmask) DDRAW_dump_flags_nolf(flagmask, flags, sizeof(flags)/sizeof(flags[0])); } -static void -DDRAW_dump_members(DWORD flags, - const void* data, - const member_info* mems, - size_t num_mems) +static void DDRAW_dump_members(DWORD flags, const void *data, const struct member_info *mems, size_t num_mems) { unsigned int i; @@ -821,32 +817,32 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) { #define STRUCT DDSURFACEDESC2 - static const member_info members[] = - { - ME(DDSD_HEIGHT, DDRAW_dump_DWORD, dwHeight), - ME(DDSD_WIDTH, DDRAW_dump_DWORD, dwWidth), - ME(DDSD_PITCH, DDRAW_dump_DWORD, u1 /* lPitch */), - ME(DDSD_LINEARSIZE, DDRAW_dump_DWORD, u1 /* dwLinearSize */), - ME(DDSD_BACKBUFFERCOUNT, DDRAW_dump_DWORD, dwBackBufferCount), - ME(DDSD_MIPMAPCOUNT, DDRAW_dump_DWORD, u2 /* dwMipMapCount */), - ME(DDSD_ZBUFFERBITDEPTH, DDRAW_dump_DWORD, u2 /* dwZBufferBitDepth */), /* This is for 'old-style' D3D */ - ME(DDSD_REFRESHRATE, DDRAW_dump_DWORD, u2 /* dwRefreshRate */), - ME(DDSD_ALPHABITDEPTH, DDRAW_dump_DWORD, dwAlphaBitDepth), - ME(DDSD_LPSURFACE, DDRAW_dump_PTR, lpSurface), - ME(DDSD_CKDESTOVERLAY, DDRAW_dump_DDCOLORKEY, u3 /* ddckCKDestOverlay */), - ME(DDSD_CKDESTBLT, DDRAW_dump_DDCOLORKEY, ddckCKDestBlt), - ME(DDSD_CKSRCOVERLAY, DDRAW_dump_DDCOLORKEY, ddckCKSrcOverlay), - ME(DDSD_CKSRCBLT, DDRAW_dump_DDCOLORKEY, ddckCKSrcBlt), - ME(DDSD_PIXELFORMAT, DDRAW_dump_pixelformat, u4 /* ddpfPixelFormat */) - }; - static const member_info members_caps[] = - { - ME(DDSD_CAPS, DDRAW_dump_DDSCAPS, ddsCaps) - }; - static const member_info members_caps2[] = - { - ME(DDSD_CAPS, DDRAW_dump_DDSCAPS2, ddsCaps) - }; + static const struct member_info members[] = + { + ME(DDSD_HEIGHT, DDRAW_dump_DWORD, dwHeight), + ME(DDSD_WIDTH, DDRAW_dump_DWORD, dwWidth), + ME(DDSD_PITCH, DDRAW_dump_DWORD, u1 /* lPitch */), + ME(DDSD_LINEARSIZE, DDRAW_dump_DWORD, u1 /* dwLinearSize */), + ME(DDSD_BACKBUFFERCOUNT, DDRAW_dump_DWORD, dwBackBufferCount), + ME(DDSD_MIPMAPCOUNT, DDRAW_dump_DWORD, u2 /* dwMipMapCount */), + ME(DDSD_ZBUFFERBITDEPTH, DDRAW_dump_DWORD, u2 /* dwZBufferBitDepth */), /* This is for 'old-style' D3D */ + ME(DDSD_REFRESHRATE, DDRAW_dump_DWORD, u2 /* dwRefreshRate */), + ME(DDSD_ALPHABITDEPTH, DDRAW_dump_DWORD, dwAlphaBitDepth), + ME(DDSD_LPSURFACE, DDRAW_dump_PTR, lpSurface), + ME(DDSD_CKDESTOVERLAY, DDRAW_dump_DDCOLORKEY, u3 /* ddckCKDestOverlay */), + ME(DDSD_CKDESTBLT, DDRAW_dump_DDCOLORKEY, ddckCKDestBlt), + ME(DDSD_CKSRCOVERLAY, DDRAW_dump_DDCOLORKEY, ddckCKSrcOverlay), + ME(DDSD_CKSRCBLT, DDRAW_dump_DDCOLORKEY, ddckCKSrcBlt), + ME(DDSD_PIXELFORMAT, DDRAW_dump_pixelformat, u4 /* ddpfPixelFormat */) + }; + static const struct member_info members_caps[] = + { + ME(DDSD_CAPS, DDRAW_dump_DDSCAPS, ddsCaps) + }; + static const struct member_info members_caps2[] = + { + ME(DDSD_CAPS, DDRAW_dump_DDSCAPS2, ddsCaps) + }; #undef STRUCT if (NULL == lpddsd)
1
0
0
0
Alexandre Julliard : urlmon/tests: Allow more COOKIE_SENT notifications.
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: 7f1b26a0a93f7f198f9bba63389c137088cd408f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7f1b26a0a93f7f198f9bba633…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 23:44:35 2012 +0200 urlmon/tests: Allow more COOKIE_SENT notifications. --- dlls/urlmon/tests/protocol.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9c864e2..a39b8ed 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -583,8 +583,6 @@ static void call_continue(PROTOCOLDATA *protocol_data) CHECK_CALLED(ReportProgress_REDIRECTING); state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } - else if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) - CLEAR_CALLED(ReportProgress_COOKIE_SENT); switch(state) { case STATE_SENDINGREQUEST: @@ -2998,6 +2996,9 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym if(prot == HTTPS_TEST) CLEAR_CALLED(ReportProgress_SENDINGREQUEST); + if (prot == HTTP_TEST || prot == HTTPS_TEST) + CLEAR_CALLED(ReportProgress_COOKIE_SENT); + hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres);
1
0
0
0
Alexandre Julliard : wininet/tests: Add even more optional COOKIE_SENT messages.
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: 80376eacd5c42e34ad629b554617537dad486b6e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=80376eacd5c42e34ad629b554…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 23:40:21 2012 +0200 wininet/tests: Add even more optional COOKIE_SENT messages. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7984f16..6be48a3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -440,8 +440,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); - SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); - SET_OPTIONAL(INTERNET_STATUS_COOKIE_RECEIVED); + SET_OPTIONAL2(INTERNET_STATUS_COOKIE_SENT,2); + SET_OPTIONAL2(INTERNET_STATUS_COOKIE_RECEIVED,2); if (first_connection_to_test_url) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME);
1
0
0
0
Alexandre Julliard : msi/tests: Skip MsiEnumProductsEx tests if not supported.
by Alexandre Julliard
04 May '12
04 May '12
Module: wine Branch: master Commit: 720a37d77870ae5ba44decb6829fa42d0dbbd65a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=720a37d77870ae5ba44decb68…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 23:31:43 2012 +0200 msi/tests: Skip MsiEnumProductsEx tests if not supported. --- dlls/msi/tests/msi.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index c0ca658..da6b446 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11823,6 +11823,12 @@ static void test_MsiEnumProductsEx(void) REGSAM access = KEY_ALL_ACCESS; char *usersid = get_user_sid(); + if (!pMsiEnumProductsExA) + { + win_skip("MsiEnumProductsExA not implemented\n"); + return; + } + create_test_guid( product0, NULL ); create_test_guid( product1, product_squashed1 ); create_test_guid( product2, product_squashed2 );
1
0
0
0
Frédéric Delanoy : Assorted spelling fixes
by Jeremy Newman
03 May '12
03 May '12
Module: website Branch: master Commit: 10de369cdde4f94ece3494ee3149d776382d9add URL:
http://source.winehq.org/git/website.git/?a=commit;h=10de369cdde4f94ece3494…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 3 02:11:30 2012 +0200 Assorted spelling fixes --- templates/en/acknowledgement.template | 4 ++-- templates/en/developer-cheatsheet.template | 16 ++++++++-------- templates/en/download.template | 2 +- templates/en/download/ubuntu.template | 2 +- templates/en/forums.template | 2 +- templates/en/irc.template | 2 +- templates/en/why.template | 4 ++-- templates/en/winelib.template | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) Diff:
http://source.winehq.org/git/website.git/?a=commitdiff;h=10de369cdde4f94ece…
1
0
0
0
← Newer
1
...
60
61
62
63
64
65
66
...
74
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
Results per page:
10
25
50
100
200