November 2013 - Wine-commits

Jacek Caban : sspi.h: Added some missing declarations.
by Alexandre Julliard 29 Nov '13

29 Nov '13

Module: wine Branch: master Commit: 17027a60b09bb3da226df6381dc36fa1e9491b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17027a60b09bb3da226df6381… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 29 13:16:47 2013 +0100 sspi.h: Added some missing declarations. --- include/sspi.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/sspi.h b/include/sspi.h index 15adb59..b8761a5 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -204,6 +204,17 @@ typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CREDENTIALS_ATTRIBUTES_FN_W) (PCredHandle, ULONG, PVOID); #define QUERY_CREDENTIALS_ATTRIBUTES_FN WINELIB_NAME_AW(QUERY_CREDENTIALS_ATTRIBUTES_FN_) +typedef struct _SEC_CHANNEL_BINDINGS { + ULONG dwInitiatorAddrType; + ULONG cbInitiatorLength; + ULONG dwInitiatorOffset; + ULONG dwAcceptorAddrType; + ULONG cbAcceptorLength; + ULONG dwAcceptorOffset; + ULONG cbApplicationDataLength; + ULONG dwApplicationDataOffset; +} SEC_CHANNEL_BINDINGS, *PSEC_CHANNEL_BINDINGS; + /* values for QueryCredentialsAttributes ulAttribute */ #define SECPKG_CRED_ATTR_NAMES 1 @@ -436,6 +447,20 @@ typedef SECURITY_STATUS (SEC_ENTRY *QUERY_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle, #define SECPKG_ATTR_ACCESS_TOKEN 18 #define SECPKG_ATTR_TARGET 19 #define SECPKG_ATTR_AUTHENTICATION_ID 20 +#define SECPKG_ATTR_LOGOFF_TIME 21 +#define SECPKG_ATTR_NEGO_KEYS 22 +#define SECPKG_ATTR_PROMPTING_NEEDED 24 +#define SECPKG_ATTR_UNIQUE_BINDINGS 25 +#define SECPKG_ATTR_ENDPOINT_BINDINGS 26 +#define SECPKG_ATTR_CLIENT_SPECIFIED_TARGET 27 +#define SECPKG_ATTR_LAST_CLIENT_TOKEN_STATUS 30 +#define SECPKG_ATTR_NEGO_PKG_INFO 31 +#define SECPKG_ATTR_NEGO_STATUS 32 +#define SECPKG_ATTR_CONTEXT_DELETED 33 + +#define SECPKG_ATTR_SUBJECT_SECURITY_ATTRIBUTES 128 +#define SECPKG_ATTR_NEGO_INFO_FLAG_NO_KERBEROS 0x1 +#define SECPKG_ATTR_NEGO_INFO_FLAG_NO_NTLM 0x2 /* types for QueryContextAttributes/SetContextAttributes */ @@ -641,6 +666,12 @@ typedef struct _SecPkgContext_Target char *Target; } SecPkgContext_Target, *PSecPkgContext_Target; +typedef struct _SecPkgContext_Bindings +{ + ULONG BindingsLength; + SEC_CHANNEL_BINDINGS *Bindings; +} SecPkgContext_Bindings, *PSecPkgContext_Bindings; + SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext); typedef SECURITY_STATUS (SEC_ENTRY *IMPERSONATE_SECURITY_CONTEXT_FN)

1 0

Frédéric Delanoy : winmm: Use BOOL type where appropriate.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 576102e9aa1cb3039ac559b812d1c7b2c3ab15aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=576102e9aa1cb3039ac559b81… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:52:00 2013 +0100 winmm: Use BOOL type where appropriate. --- dlls/winmm/lolvldrv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index f387323..c3b3674 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -64,7 +64,8 @@ static WINE_LLTYPE llTypes[MMDRV_MAX] = { { "WaveOut", 0, 0, -1 } }; -static int drivers_loaded, MMDrvsHi; +static BOOL drivers_loaded; +static int MMDrvsHi; static WINE_MM_DRIVER MMDrvs[8]; static LPWINE_MLD MM_MLDrvs[40]; #define MAX_MM_MLDRVS (sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) @@ -73,7 +74,7 @@ static void MMDRV_Init(void); static void MMDRV_InitSingleType(UINT type) { if (!drivers_loaded) { - drivers_loaded = 1; + drivers_loaded = TRUE; MMDRV_Init(); } }

1 0

Frédéric Delanoy : wintab32: Use BOOL type where appropriate.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: c76cc4a555b4ea06768bbf474a6e251251fb256c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76cc4a555b4ea06768bbf474… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:52:01 2013 +0100 wintab32: Use BOOL type where appropriate. --- dlls/wintab32/context.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index c8940b3..7278373 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -624,7 +624,7 @@ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) TRACE("(%p, %d, %p)\n", hCtx, wSerial, lpPkt); if (!hCtx) - return 0; + return FALSE; EnterCriticalSection(&csTablet); @@ -632,7 +632,7 @@ BOOL WINAPI WTPacket(HCTX hCtx, UINT wSerial, LPVOID lpPkt) if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } rc = TABLET_FindPacket(context ,wSerial, &wtp); @@ -671,7 +671,7 @@ BOOL WINAPI WTEnable(HCTX hCtx, BOOL fEnable) if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } /* if we want to enable and it is not enabled then */ @@ -770,14 +770,14 @@ BOOL WINAPI WTGetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) TRACE("(%p, %p)\n", hCtx, lpLogCtx); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } LOGCONTEXTWtoA(&context->context, lpLogCtx); @@ -795,14 +795,14 @@ BOOL WINAPI WTGetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) TRACE("(%p, %p)\n", hCtx, lpLogCtx); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } memmove(lpLogCtx,&context->context,sizeof(LOGCONTEXTW)); @@ -1066,7 +1066,7 @@ BOOL WINAPI WTQueuePacketsEx(HCTX hCtx, UINT *lpOld, UINT *lpNew) TRACE("(%p, %p, %p)\n", hCtx, lpOld, lpNew); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); @@ -1117,7 +1117,7 @@ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) TRACE("(%p, %d)\n", hCtx, nPkts); - if (!hCtx) return 0; + if (!hCtx) return FALSE; EnterCriticalSection(&csTablet); @@ -1125,7 +1125,7 @@ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) if (!context) { LeaveCriticalSection(&csTablet); - return 0; + return FALSE; } context->PacketQueue = HeapReAlloc(GetProcessHeap(), 0,

1 0

Hans Leidekker : mlang: Improve IMLangLineBreakConsole:: BreakLineA for the ASCII codepage.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 8c08faba490d821c61033eaec606e8862fe0964b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c08faba490d821c61033eaec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 27 10:59:23 2013 +0100 mlang: Improve IMLangLineBreakConsole::BreakLineA for the ASCII codepage. --- dlls/mlang/mlang.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 96ccbf7..f4a689c 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -36,6 +36,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "mlang.h" +#include "mimeole.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -44,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); #include "initguid.h" -#define CP_UNICODE 1200 - static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); @@ -3484,10 +3483,28 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA( LONG* pcchLine, LONG* pcchSkip) { + LONG i, line = cchSrc, skip = 0; + FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); - *pcchLine = cchSrc; - *pcchSkip = 0; + if (uCodePage == CP_USASCII && cchSrc > cMaxColumns) + { + for (line = cMaxColumns, i = cMaxColumns - 1; i >= 0; i--) + { + if (pszSrc[i] == ' ') + { + while (i >= 0 && pszSrc[i] == ' ') + { + i--; + line--; + skip++; + } + break; + } + } + } + *pcchLine = line; + *pcchSkip = skip; return S_OK; }

1 0

Henri Verbeet : wined3d: Merge the texture creation functions.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 4b3db52b53faf65ce0f4ff35faf96bc64d652820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3db52b53faf65ce0f4ff35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:48 2013 +0100 wined3d: Merge the texture creation functions. --- dlls/d3d10core/texture.c | 6 +- dlls/d3d8/device.c | 4 +- dlls/d3d8/texture.c | 6 +- dlls/d3d9/device.c | 4 +- dlls/d3d9/texture.c | 6 +- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 19 ++++----- dlls/wined3d/device.c | 4 +- dlls/wined3d/surface.c | 3 +- dlls/wined3d/texture.c | 90 +++++++++++---------------------------------- dlls/wined3d/wined3d.spec | 4 +- include/wine/wined3d.h | 7 +--- 12 files changed, 50 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b3db52b53faf65ce0f4f…

1 0

Henri Verbeet : ddraw: Move the location validation from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 559229aa1009e6d467a9cf6da18f6c5a400ed5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=559229aa1009e6d467a9cf6da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:49 2013 +0100 ddraw: Move the location validation from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 8 -------- dlls/ddraw/surface.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 314b5a0..5f6d792 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2814,7 +2814,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, struct ddraw_surface *object = NULL; HRESULT hr; DDSURFACEDESC2 desc2; - const DWORD sysvidmem = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY; TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); @@ -2870,13 +2869,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, return DDERR_INVALIDCAPS; } - /* This is a special case in ddrawex, but not allowed in ddraw. */ - if ((DDSD->ddsCaps.dwCaps & sysvidmem) == sysvidmem) - { - WARN("Tried to create a surface in both system and video memory.\n"); - return DDERR_INVALIDCAPS; - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 74bdce9..e127f72 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + /* This is a special case in ddrawex, but not allowed in ddraw. */ + if ((desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + == (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("Tried to create a surface in both system and video memory.\n"); + return DDERR_INVALIDCAPS; + } + if ((desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_ALLFACES) && !(desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)) {

1 0

Henri Verbeet : ddraw: Create back buffers in ddraw_surface_create_texture( ).
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 2105b4493fad705f7c597b7ebf9b163bd0e4b333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2105b4493fad705f7c597b7eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:50 2013 +0100 ddraw: Create back buffers in ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 46 --------------------------- dlls/ddraw/surface.c | 85 ++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 62 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5f6d792..73fa17a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2872,10 +2872,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); - /* The first surface is a front buffer, the back buffer is created afterwards */ - if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - desc2.ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER; - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, &object))) { WARN("Failed to create texture, hr %#x.\n", hr); @@ -2885,48 +2881,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, *surface = object; - /* Create Additional surfaces if necessary - * This applies to Primary surfaces which have a back buffer count - * set, but not to mipmap textures. In case of Mipmap textures, - * wineD3D takes care of the creation of additional surfaces - */ - if(DDSD->dwFlags & DDSD_BACKBUFFERCOUNT) - { - struct ddraw_surface *last = object; - UINT i; - - desc2.ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; /* It's not a front buffer */ - desc2.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; - desc2.dwBackBufferCount = 0; - - for (i = 0; i < DDSD->dwBackBufferCount; ++i) - { - struct ddraw_surface *object2 = NULL; - - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, &object2))) - { - if (version == 7) - IDirectDrawSurface7_Release(&object->IDirectDrawSurface7_iface); - else if (version == 4) - IDirectDrawSurface4_Release(&object->IDirectDrawSurface4_iface); - else - IDirectDrawSurface_Release(&object->IDirectDrawSurface_iface); - - return hr; - } - - /* Add the new surface to the complex attachment array. */ - last->complex_array[0] = object2; - last = object2; - - /* Remove the (possible) back buffer cap from the new surface - * description, because only one surface in the flipping chain is a - * back buffer, one is a front buffer, the others are just primary - * surfaces. */ - desc2.ddsCaps.dwCaps &= ~DDSCAPS_BACKBUFFER; - } - } - if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ddraw->primary = object; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e127f72..e9f0d42 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5687,22 +5687,26 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, if (!desc->dwWidth || !desc->dwHeight) return DDERR_INVALIDPARAMS; - if ((desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER) - && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - struct wined3d_swapchain_desc swapchain_desc; + /* The first surface is a front buffer, the back buffers are created + * afterwards. */ + desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE | DDSCAPS_FRONTBUFFER; + if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) + { + struct wined3d_swapchain_desc swapchain_desc; - wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); - swapchain_desc.backbuffer_width = mode.width; - swapchain_desc.backbuffer_height = mode.height; - swapchain_desc.backbuffer_format = mode.format_id; + wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); + swapchain_desc.backbuffer_width = mode.width; + swapchain_desc.backbuffer_height = mode.height; + swapchain_desc.backbuffer_format = mode.format_id; - if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) - { - ERR("Failed to reset device.\n"); - return hr; + if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, + &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) + { + ERR("Failed to reset device.\n"); + return hr; + } } } @@ -5792,9 +5796,6 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, } } - if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; - if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) { wined3d_desc.pool = WINED3D_POOL_SYSTEM_MEM; @@ -5926,9 +5927,61 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, } } + if (desc->dwFlags & DDSD_BACKBUFFERCOUNT) + { + unsigned int count = desc->dwBackBufferCount; + struct ddraw_surface *last = root; + + attach = &last->complex_array[0]; + for (i = 0; i < count; ++i) + { + if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) + { + hr = E_OUTOFMEMORY; + goto fail; + } + + texture->version = version; + texture->surface_desc = root->surface_desc; + desc = &texture->surface_desc; + + /* Only one surface in the flipping chain is a back buffer, one is + * a front buffer, the others are just primary surfaces. */ + desc->ddsCaps.dwCaps &= ~(DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER); + if (!i) + desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; + desc->dwBackBufferCount = 0; + + if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, &wined3d_desc, 1, + WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) + { + HeapFree(GetProcessHeap(), 0, texture); + goto fail; + } + + resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + last = wined3d_resource_get_parent(resource); + last->wined3d_texture = wined3d_texture; + texture->root = last; + + *attach = last; + attach = &last->complex_array[0]; + } + } + *surface = root; return DD_OK; + +fail: + if (version == 7) + IDirectDrawSurface7_Release(&root->IDirectDrawSurface7_iface); + else if (version == 4) + IDirectDrawSurface4_Release(&root->IDirectDrawSurface4_iface); + else + IDirectDrawSurface_Release(&root->IDirectDrawSurface_iface); + + return hr; } HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture,

1 0

Henri Verbeet : ddraw: Move the primary surface validation from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 3139249a2eceae05130472ea53aea2a8d6184f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3139249a2eceae05130472ea5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:51 2013 +0100 ddraw: Move the primary surface validation from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 6 ------ dlls/ddraw/surface.c | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 73fa17a..109d745 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2863,12 +2863,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, return DDERR_NOEXCLUSIVEMODE; } - if((DDSD->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) - { - WARN("Application wanted to create back buffer primary surface\n"); - return DDERR_INVALIDCAPS; - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e9f0d42..ebbd6c1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,13 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + if ((desc->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) + == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) + { + WARN("Tried to create a back buffer surface.\n"); + return DDERR_INVALIDCAPS; + } + /* This is a special case in ddrawex, but not allowed in ddraw. */ if ((desc->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) == (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY))

1 0

Henri Verbeet : ddraw: Move the flippable validation from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 5889f822f10c63d22251cc993726f3dbe465986a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5889f822f10c63d22251cc993… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 27 11:04:52 2013 +0100 ddraw: Move the flippable validation from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 8 -------- dlls/ddraw/surface.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 109d745..415eda0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2855,14 +2855,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, DDSD->dwFlags &= ~DDSD_LPSURFACE; } - if ((DDSD->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) - == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) - && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) - { - WARN("Attempted to create a flipable primary surface without DDSCL_EXCLUSIVE.\n"); - return DDERR_NOEXCLUSIVEMODE; - } - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ebbd6c1..4c5021d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5608,6 +5608,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, DDRAW_dump_surface_desc(desc); } + if ((desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE)) + == (DDSCAPS_FLIP | DDSCAPS_PRIMARYSURFACE) + && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + { + WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); + return DDERR_NOEXCLUSIVEMODE; + } + if ((desc->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) {

1 0

Nikolay Sivov : qmgr: Implement Get/SetNotifyFlags().
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 76c3f0cffb793511f0bb76bd10749102aebb9709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c3f0cffb793511f0bb76bd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 27 16:49:55 2013 +0400 qmgr: Implement Get/SetNotifyFlags(). --- dlls/qmgr/job.c | 24 ++++++++++++++++++++---- dlls/qmgr/qmgr.h | 1 + dlls/qmgr/tests/job.c | 13 +++++++++++++ include/bits.idl | 1 + 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index ac7deaf..52c7b7f 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -410,8 +410,17 @@ static HRESULT WINAPI BackgroundCopyJob_SetNotifyFlags( ULONG Val) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - FIXME("(%p)->(%d): stub\n", This, Val); - return E_NOTIMPL; + static const ULONG valid_flags = BG_NOTIFY_JOB_TRANSFERRED | + BG_NOTIFY_JOB_ERROR | + BG_NOTIFY_DISABLE | + BG_NOTIFY_JOB_MODIFICATION | + BG_NOTIFY_FILE_TRANSFERRED; + + TRACE("(%p)->(0x%x)\n", This, Val); + + if (Val & ~valid_flags) return E_NOTIMPL; + This->notify_flags = Val; + return S_OK; } static HRESULT WINAPI BackgroundCopyJob_GetNotifyFlags( @@ -419,8 +428,14 @@ static HRESULT WINAPI BackgroundCopyJob_GetNotifyFlags( ULONG *pVal) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - FIXME("(%p)->(%p): stub\n", This, pVal); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pVal); + + if (!pVal) return E_INVALIDARG; + + *pVal = This->notify_flags; + + return S_OK; } static HRESULT WINAPI BackgroundCopyJob_SetNotifyInterface( @@ -689,6 +704,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->state = BG_JOB_STATE_SUSPENDED; This->description = NULL; + This->notify_flags = BG_NOTIFY_JOB_ERROR | BG_NOTIFY_JOB_TRANSFERRED; *job = This; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 63d9f91..eb982a0 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -43,6 +43,7 @@ typedef struct struct list files; BG_JOB_PROGRESS jobProgress; BG_JOB_STATE state; + ULONG notify_flags; /* Protects file list, and progress */ CRITICAL_SECTION cs; struct list entryFromQmgr; diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 1979140..f311235 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -414,6 +414,18 @@ static void test_CompleteLocalURL(void) HeapFree(GetProcessHeap(), 0, urlB); } +static void test_NotifyFlags(void) +{ + ULONG flags; + HRESULT hr; + + /* check default flags */ + flags = 0; + hr = IBackgroundCopyJob_GetNotifyFlags(test_job, &flags); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(flags == (BG_NOTIFY_JOB_ERROR | BG_NOTIFY_JOB_TRANSFERRED), "flags 0x%08x\n", flags); +} + typedef void (*test_t)(void); START_TEST(job) @@ -425,6 +437,7 @@ START_TEST(job) test_GetProgress_preTransfer, test_GetState, test_ResumeEmpty, + test_NotifyFlags, 0 }; static const test_t tests_bits20[] = { diff --git a/include/bits.idl b/include/bits.idl index 2eed38d..0e3362c 100644 --- a/include/bits.idl +++ b/include/bits.idl @@ -29,6 +29,7 @@ cpp_quote("#define BG_NOTIFY_JOB_TRANSFERRED 0x0001") cpp_quote("#define BG_NOTIFY_JOB_ERROR 0x0002") cpp_quote("#define BG_NOTIFY_DISABLE 0x0004") cpp_quote("#define BG_NOTIFY_JOB_MODIFICATION 0x0008") +cpp_quote("#define BG_NOTIFY_FILE_TRANSFERRED 0x0010") cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef EnumJobs")

1 0