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
January 2014
----- 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
3 participants
814 discussions
Start a n
N
ew thread
Stefan Dösinger : ddraw/tests: Add a getdc test with a custom pitch.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: 03b2e737d2dcf1b1c668084c4d24fa7fdccf819c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=03b2e737d2dcf1b1c668084c4…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:16 2014 +0100 ddraw/tests: Add a getdc test with a custom pitch. --- dlls/ddraw/tests/ddraw2.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 40 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 117 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 46882be..30c5b81 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1,6 +1,6 @@ /* * Copyright 2011-2012 Henri Verbeet for CodeWeavers - * Copyright 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2012-2014 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4878,6 +4878,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -4926,6 +4927,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface3_GetDC(surface3, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface3_ReleaseDC(surface3, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0xaaaaaaaa on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface3_Release(surface3); ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index df1a23c..e737b42 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1,6 +1,6 @@ /* * Copyright 2011-2012 Henri Verbeet for CodeWeavers - * Copyright 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2012-2014 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -5479,6 +5479,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -5523,6 +5524,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface4_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface4_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0x00000000 on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface4_Release(surface); ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e36927e..f8fa70f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1,5 +1,5 @@ /* - * Copyright 2006, 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2006, 2012-2014 Stefan Dösinger for CodeWeavers * Copyright 2011 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -5373,6 +5373,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -5417,6 +5418,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface7_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface7_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0x00000000 on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface7_Release(surface); ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref);
1
0
0
0
Stefan Dösinger : wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc .
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: b91973daa7601991ea70a75c3e2faebde9d34bdc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b91973daa7601991ea70a75c3…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:15 2014 +0100 wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc . --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 7 ++++-- dlls/ddraw/surface.c | 25 ++++---------------- dlls/wined3d/device.c | 6 ++--- dlls/wined3d/surface.c | 57 +++++++++++++-------------------------------- dlls/wined3d/wined3d.spec | 3 +-- include/wine/wined3d.h | 4 ++-- 7 files changed, 33 insertions(+), 71 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91973daa7601991ea70a…
1
0
0
0
Stefan Dösinger : wined3d: Simplify wined3d_surface_set_mem.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: 82666af87aaf51d2b8cf648b6d6c85154d45e346 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=82666af87aaf51d2b8cf648b6…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:14 2014 +0100 wined3d: Simplify wined3d_surface_set_mem. --- dlls/wined3d/surface.c | 61 ++++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b96a21..9b9e245 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2619,54 +2619,29 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem return WINED3DERR_INVALIDCALL; } - if (mem && mem != surface->user_memory) + if (surface->flags & SFLAG_DIBSECTION) { - /* Do I have to copy the old surface content? */ - if (surface->flags & SFLAG_DIBSECTION) - { - DeleteDC(surface->hDC); - DeleteObject(surface->dib.DIBsection); - surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; - surface->hDC = NULL; - surface->flags &= ~SFLAG_DIBSECTION; - } - else if (!(surface->flags & SFLAG_USERPTR)) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = NULL; - } - surface->user_memory = mem; - surface->flags |= SFLAG_USERPTR; - - /* Now the surface memory is most up do date. Invalidate drawable and texture. */ - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - - /* For client textures OpenGL has to be notified. */ - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); + DeleteDC(surface->hDC); + DeleteObject(surface->dib.DIBsection); + surface->dib.bitmap_data = NULL; + surface->resource.allocatedMemory = NULL; + surface->hDC = NULL; + surface->flags &= ~SFLAG_DIBSECTION; } - else if (surface->flags & SFLAG_USERPTR) + else if (!(surface->flags & SFLAG_USERPTR)) { - /* heap_memory should be NULL already. */ - if (surface->resource.heap_memory) - ERR("User pointer surface has heap memory allocated.\n"); - - if (!mem) - { - surface->user_memory = NULL; - surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); - - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); + wined3d_resource_free_sysmem(&surface->resource); + surface->resource.allocatedMemory = NULL; + } - surface_prepare_system_memory(surface); - } + surface->user_memory = mem; + surface->flags |= SFLAG_USERPTR; + surface_validate_location(surface, SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - } + /* For client textures OpenGL has to be notified. */ + if (surface->flags & SFLAG_CLIENT) + surface_release_client_storage(surface); surface->pitch = pitch;
1
0
0
0
Stefan Dösinger : ddraw: Always set surface width, height and format in ddraw_surface7_SetSurfaceDesc.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: 2a012ba16ff03e90cb51a7db4bf9f7b1e8781b78 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2a012ba16ff03e90cb51a7db4…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:13 2014 +0100 ddraw: Always set surface width, height and format in ddraw_surface7_SetSurfaceDesc. --- dlls/ddraw/surface.c | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 96f6950..4abe3bf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4278,7 +4278,6 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, const DWORD allowed_flags = DDSD_LPSURFACE | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_CAPS; enum wined3d_format_id format_id; - BOOL update_wined3d = FALSE; UINT pitch, width, height; TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags); @@ -4332,15 +4331,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } if (DDSD->dwWidth != This->surface_desc.dwWidth) - { TRACE("Surface width changed from %u to %u.\n", This->surface_desc.dwWidth, DDSD->dwWidth); - update_wined3d = TRUE; - } if (DDSD->u1.lPitch != This->surface_desc.u1.lPitch) - { TRACE("Surface pitch changed from %u to %u.\n", This->surface_desc.u1.lPitch, DDSD->u1.lPitch); - update_wined3d = TRUE; - } pitch = DDSD->u1.lPitch; width = DDSD->dwWidth; } @@ -4363,10 +4356,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } if (DDSD->dwHeight != This->surface_desc.dwHeight) - { TRACE("Surface height changed from %u to %u.\n", This->surface_desc.dwHeight, DDSD->dwHeight); - update_wined3d = TRUE; - } height = DDSD->dwHeight; } else @@ -4388,36 +4378,30 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } current_format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); if (format_id != current_format_id) - { TRACE("Surface format changed from %#x to %#x.\n", current_format_id, format_id); - update_wined3d = TRUE; - } } else { format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); } - if (update_wined3d) + if (FAILED(hr = wined3d_surface_update_desc(This->wined3d_surface, width, height, + format_id, WINED3D_MULTISAMPLE_NONE, 0))) { - if (FAILED(hr = wined3d_surface_update_desc(This->wined3d_surface, width, height, - format_id, WINED3D_MULTISAMPLE_NONE, 0))) - { - WARN("Failed to update surface desc, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - if (DDSD->dwFlags & DDSD_WIDTH) - This->surface_desc.dwWidth = width; - if (DDSD->dwFlags & DDSD_PITCH) - This->surface_desc.u1.lPitch = DDSD->u1.lPitch; - if (DDSD->dwFlags & DDSD_HEIGHT) - This->surface_desc.dwHeight = height; - if (DDSD->dwFlags & DDSD_PIXELFORMAT) - This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + WARN("Failed to update surface desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; } + if (DDSD->dwFlags & DDSD_WIDTH) + This->surface_desc.dwWidth = width; + if (DDSD->dwFlags & DDSD_PITCH) + This->surface_desc.u1.lPitch = DDSD->u1.lPitch; + if (DDSD->dwFlags & DDSD_HEIGHT) + This->surface_desc.dwHeight = height; + if (DDSD->dwFlags & DDSD_PIXELFORMAT) + This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { if (FAILED(hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface, pitch)))
1
0
0
0
Stefan Dösinger : wined3d: Support custom pitches in wined3d_surface_update_desc.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: 70eab9d025c163aa039ada7edb751774defacbe0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=70eab9d025c163aa039ada7ed…
Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:12 2014 +0100 wined3d: Support custom pitches in wined3d_surface_update_desc. --- dlls/wined3d/surface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2fca299..7b96a21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2861,7 +2861,10 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.format = format; surface->resource.multisample_type = multisample_type; surface->resource.multisample_quality = multisample_quality; - surface->resource.size = resource_size; + if (surface->pitch) + surface->resource.size = height * surface->pitch; + else + surface->resource.size = resource_size; if (create_dib) {
1
0
0
0
Martin Storsjo : api-ms-win-core-util-l1-1-0: Add stub dll.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: 8d9ecf70e258b4fd76e43b869954974194154deb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8d9ecf70e258b4fd76e43b869…
Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:28 2014 +0200 api-ms-win-core-util-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-util-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index e45776c..a41afa4 100755 --- a/configure +++ b/configure @@ -862,6 +862,7 @@ enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 +enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16580,6 +16581,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 +wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index f36dbd7..3d3e039 100644 --- a/configure.ac +++ b/configure.ac @@ -2634,6 +2634,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-util-l1-1-0/Makefile.in b/dlls/api-ms-win-core-util-l1-1-0/Makefile.in new file mode 100644 index 0000000..4e2321d --- /dev/null +++ b/dlls/api-ms-win-core-util-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-util-l1-1-0.dll diff --git a/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec new file mode 100644 index 0000000..471ee42 --- /dev/null +++ b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall Beep(long long) kernel32.Beep +@ stdcall DecodePointer(ptr) kernel32.DecodePointer +@ stub DecodeSystemPointer +@ stdcall EncodePointer(ptr) kernel32.EncodePointer +@ stub EncodeSystemPointer diff --git a/tools/make_specfiles b/tools/make_specfiles index 2edb446..38917eb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -143,6 +143,7 @@ my @dll_groups = "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", + "api-ms-win-core-util-l1-1-0", ], [ "ole32",
1
0
0
0
Martin Storsjo : api-ms-win-core-sysinfo-l1-2-0: Add stub dll.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: 6f174587937f7065ca62702e2258f965a9fb0ea8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6f174587937f7065ca62702e2…
Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:27 2014 +0200 api-ms-win-core-sysinfo-l1-2-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-sysinfo-l1-2-0.spec | 31 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 36 insertions(+) diff --git a/configure b/configure index 41a0b2c..e45776c 100755 --- a/configure +++ b/configure @@ -861,6 +861,7 @@ enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_string_l1_1_0 +enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16578,6 +16579,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 9ec46f2..f36dbd7 100644 --- a/configure.ac +++ b/configure.ac @@ -2633,6 +2633,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in b/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in new file mode 100644 index 0000000..856ae15 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sysinfo-l1-2-0.dll diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec new file mode 100644 index 0000000..47f4419 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec @@ -0,0 +1,31 @@ +@ stub EnumSystemFirmwareTables +@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA +@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetLocalTime(ptr) kernel32.GetLocalTime +@ stdcall GetLogicalProcessorInformation(ptr ptr) kernel32.GetLogicalProcessorInformation +@ stdcall GetLogicalProcessorInformationEx(long ptr ptr) kernel32.GetLogicalProcessorInformationEx +@ stdcall GetNativeSystemInfo(ptr) kernel32.GetNativeSystemInfo +@ stub GetOsSafeBootMode +@ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo +@ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA +@ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW +@ stub GetSystemFirmwareTable +@ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo +@ stdcall GetSystemTime(ptr) kernel32.GetSystemTime +@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment +@ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime +@ stub GetSystemTimePreciseAsFileTime +@ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA +@ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW +@ stdcall GetTickCount() kernel32.GetTickCount +@ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 +@ stdcall GetVersion() kernel32.GetVersion +@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA +@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetWindowsDirectoryA(ptr long) kernel32.GetWindowsDirectoryA +@ stdcall GetWindowsDirectoryW(ptr long) kernel32.GetWindowsDirectoryW +@ stdcall GlobalMemoryStatusEx(ptr) kernel32.GlobalMemoryStatusEx +@ stdcall SetComputerNameExW(long wstr) kernel32.SetComputerNameExW +@ stdcall SetLocalTime(ptr) kernel32.SetLocalTime +@ stdcall SetSystemTime(ptr) kernel32.SetSystemTime +@ stdcall -ret64 VerSetConditionMask(long long long long) kernel32.VerSetConditionMask diff --git a/tools/make_specfiles b/tools/make_specfiles index 928d4b8..2edb446 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -142,6 +142,7 @@ my @dll_groups = "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-sysinfo-l1-2-0", ], [ "ole32",
1
0
0
0
Martin Storsjo : api-ms-win-core-string-l1-1-0: Add stub dll.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: 463bf7bb6153441a8b6dbe25696a0079c194b2d1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=463bf7bb6153441a8b6dbe256…
Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:26 2014 +0200 api-ms-win-core-string-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-string-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-string-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) diff --git a/configure b/configure index 5af9383..41a0b2c 100755 --- a/configure +++ b/configure @@ -860,6 +860,7 @@ enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 +enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16576,6 +16577,7 @@ wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_l wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 +wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 2e2bb95..9ec46f2 100644 --- a/configure.ac +++ b/configure.ac @@ -2632,6 +2632,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-string-l1-1-0/Makefile.in b/dlls/api-ms-win-core-string-l1-1-0/Makefile.in new file mode 100644 index 0000000..4d41488 --- /dev/null +++ b/dlls/api-ms-win-core-string-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-string-l1-1-0.dll diff --git a/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec b/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec new file mode 100644 index 0000000..5159f98 --- /dev/null +++ b/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) kernel32.CompareStringEx +@ stdcall CompareStringOrdinal(wstr long wstr long long) kernel32.CompareStringOrdinal +@ stdcall CompareStringW(long long wstr long wstr long) kernel32.CompareStringW +@ stdcall FoldStringW(long wstr long ptr long) kernel32.FoldStringW +@ stdcall GetStringTypeExW(long long wstr long ptr) kernel32.GetStringTypeExW +@ stdcall GetStringTypeW(long wstr long ptr) kernel32.GetStringTypeW +@ stdcall MultiByteToWideChar(long long str long ptr long) kernel32.MultiByteToWideChar +@ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) kernel32.WideCharToMultiByte diff --git a/tools/make_specfiles b/tools/make_specfiles index 5cfe758..928d4b8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -141,6 +141,7 @@ my @dll_groups = "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-profile-l1-1-0", + "api-ms-win-core-string-l1-1-0", ], [ "ole32",
1
0
0
0
Martin Storsjo : api-ms-win-core-profile-l1-1-0: Add stub dll.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: 3741f7176ae6c276e438cd18fb8738bb6e4d2e4e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3741f7176ae6c276e438cd18f…
Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:25 2014 +0200 api-ms-win-core-profile-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-profile-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-profile-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 417a7c9..5af9383 100755 --- a/configure +++ b/configure @@ -859,6 +859,7 @@ enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 +enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16574,6 +16575,7 @@ wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_int wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 +wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 72ece36..2e2bb95 100644 --- a/configure.ac +++ b/configure.ac @@ -2631,6 +2631,7 @@ WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-profile-l1-1-0/Makefile.in b/dlls/api-ms-win-core-profile-l1-1-0/Makefile.in new file mode 100644 index 0000000..2777171 --- /dev/null +++ b/dlls/api-ms-win-core-profile-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-profile-l1-1-0.dll diff --git a/dlls/api-ms-win-core-profile-l1-1-0/api-ms-win-core-profile-l1-1-0.spec b/dlls/api-ms-win-core-profile-l1-1-0/api-ms-win-core-profile-l1-1-0.spec new file mode 100644 index 0000000..3b09bac --- /dev/null +++ b/dlls/api-ms-win-core-profile-l1-1-0/api-ms-win-core-profile-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter +@ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency diff --git a/tools/make_specfiles b/tools/make_specfiles index 6c1a7b7..5cfe758 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -140,6 +140,7 @@ my @dll_groups = "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-2-0", + "api-ms-win-core-profile-l1-1-0", ], [ "ole32",
1
0
0
0
Martin Storsjo : api-ms-win-core-interlocked-l1-2-0: Add stub dll.
by Alexandre Julliard
08 Jan '14
08 Jan '14
Module: wine Branch: master Commit: e5c2036cfe210b948bd316cbb38f6e13a4d13dff URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e5c2036cfe210b948bd316cbb…
Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:24 2014 +0200 api-ms-win-core-interlocked-l1-2-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-interlocked-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-interlocked-l1-2-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index cbb2139..417a7c9 100755 --- a/configure +++ b/configure @@ -855,6 +855,7 @@ enable_advpack enable_amstream enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 +enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 @@ -16569,6 +16570,7 @@ wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 +wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 diff --git a/configure.ac b/configure.ac index e068c84..72ece36 100644 --- a/configure.ac +++ b/configure.ac @@ -2627,6 +2627,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) diff --git a/dlls/api-ms-win-core-interlocked-l1-2-0/Makefile.in b/dlls/api-ms-win-core-interlocked-l1-2-0/Makefile.in new file mode 100644 index 0000000..7daa74b --- /dev/null +++ b/dlls/api-ms-win-core-interlocked-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-interlocked-l1-2-0.dll diff --git a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec new file mode 100644 index 0000000..f1fbd94 --- /dev/null +++ b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec @@ -0,0 +1,12 @@ +@ stdcall InitializeSListHead(ptr) kernel32.InitializeSListHead +@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) kernel32.InterlockedCompareExchange64 +@ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) kernel32.InterlockedCompareExchange +@ stdcall -arch=i386 InterlockedDecrement(ptr) kernel32.InterlockedDecrement +@ stdcall -arch=i386 InterlockedExchange(ptr long) kernel32.InterlockedExchange +@ stdcall -arch=i386 InterlockedExchangeAdd(ptr long ) kernel32.InterlockedExchangeAdd +@ stdcall InterlockedFlushSList(ptr) kernel32.InterlockedFlushSList +@ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement +@ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList +@ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList +@ stub InterlockedPushListSListEx +@ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/tools/make_specfiles b/tools/make_specfiles index e8de5e4..6c1a7b7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -139,6 +139,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-errorhandling-l1-1-1", + "api-ms-win-core-interlocked-l1-2-0", ], [ "ole32",
1
0
0
0
← Newer
1
...
60
61
62
63
64
65
66
...
82
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
75
76
77
78
79
80
81
82
Results per page:
10
25
50
100
200