May 2019 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : dinput: Don't return unsupported interfaces.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: a2c10f4dca3ae3be7c02d2f135d14060bc660ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c10f4dca3ae3be7c02d2f1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 29 23:13:50 2019 +0000 dinput: Don't return unsupported interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 50 +++++++++++++++--------------------------- dlls/dinput/tests/dinput.c | 46 +++++++++++++-------------------------- dlls/dinput8/tests/dinput.c | 53 ++++++++++++++++----------------------------- 3 files changed, 52 insertions(+), 97 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 1b2020c..e32ccae 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -566,53 +566,39 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE if (!riid || !ppobj) return E_POINTER; + *ppobj = NULL; + +#if DIRECTINPUT_VERSION == 0x0700 if (IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IDirectInputA, riid ) || - IsEqualGUID( &IID_IDirectInput2A, riid ) || - IsEqualGUID( &IID_IDirectInput7A, riid )) - { + IsEqualGUID( &IID_IDirectInputA, riid ) || + IsEqualGUID( &IID_IDirectInput2A, riid ) || + IsEqualGUID( &IID_IDirectInput7A, riid )) *ppobj = &This->IDirectInput7A_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - - return DI_OK; - } - - if (IsEqualGUID( &IID_IDirectInputW, riid ) || - IsEqualGUID( &IID_IDirectInput2W, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid )) - { + else if (IsEqualGUID( &IID_IDirectInputW, riid ) || + IsEqualGUID( &IID_IDirectInput2W, riid ) || + IsEqualGUID( &IID_IDirectInput7W, riid )) *ppobj = &This->IDirectInput7W_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - return DI_OK; - } - - if (IsEqualGUID( &IID_IDirectInput8A, riid )) - { +#else + if (IsEqualGUID( &IID_IUnknown, riid ) || + IsEqualGUID( &IID_IDirectInput8A, riid )) *ppobj = &This->IDirectInput8A_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - - return DI_OK; - } - if (IsEqualGUID( &IID_IDirectInput8W, riid )) - { + else if (IsEqualGUID( &IID_IDirectInput8W, riid )) *ppobj = &This->IDirectInput8W_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - return DI_OK; - } +#endif if (IsEqualGUID( &IID_IDirectInputJoyConfig8, riid )) - { *ppobj = &This->IDirectInputJoyConfig8_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); + if(*ppobj) + { + IUnknown_AddRef( (IUnknown*)*ppobj ); return DI_OK; } - FIXME( "Unsupported interface: %s\n", debugstr_guid(riid)); - *ppobj = NULL; + WARN( "Unsupported interface: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 23b20d2..abf849f 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -269,23 +269,19 @@ static void test_QueryInterface(void) &IID_IDirectInput2A, &IID_IDirectInput2W, &IID_IDirectInput7A, &IID_IDirectInput7W}; - static const struct - { - REFIID riid; - int test_todo; - } no_interface_list[] = + static const REFIID no_interface_list[] = { - {&IID_IDirectInput8A, 1}, - {&IID_IDirectInput8W, 1}, - {&IID_IDirectInputDeviceA}, - {&IID_IDirectInputDeviceW}, - {&IID_IDirectInputDevice2A}, - {&IID_IDirectInputDevice2W}, - {&IID_IDirectInputDevice7A}, - {&IID_IDirectInputDevice7W}, - {&IID_IDirectInputDevice8A}, - {&IID_IDirectInputDevice8W}, - {&IID_IDirectInputEffect}, + &IID_IDirectInput8A, + &IID_IDirectInput8W, + &IID_IDirectInputDeviceA, + &IID_IDirectInputDeviceW, + &IID_IDirectInputDevice2A, + &IID_IDirectInputDevice2W, + &IID_IDirectInputDevice7A, + &IID_IDirectInputDevice7W, + &IID_IDirectInputDevice8A, + &IID_IDirectInputDevice8W, + &IID_IDirectInputEffect, }; IDirectInputA *pDI; @@ -323,21 +319,9 @@ static void test_QueryInterface(void) for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; - hr = IDirectInput_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); - if (no_interface_list[i].test_todo) - { - todo_wine - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - todo_wine - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - - if (pUnk) IUnknown_Release(pUnk); - } - else - { - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } + hr = IDirectInput_QueryInterface(pDI, no_interface_list[i], (void **)&pUnk); + ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } IDirectInput_Release(pDI); diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 28b1bd5..594ba27 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -222,27 +222,23 @@ static void test_QueryInterface(void) { static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W, &IID_IDirectInputJoyConfig8}; - static const struct - { - REFIID riid; - int test_todo; - } no_interface_list[] = + static const REFIID no_interface_list[] = { - {&IID_IDirectInputA, 1}, - {&IID_IDirectInputW, 1}, - {&IID_IDirectInput2A, 1}, - {&IID_IDirectInput2W, 1}, - {&IID_IDirectInput7A, 1}, - {&IID_IDirectInput7W, 1}, - {&IID_IDirectInputDeviceA}, - {&IID_IDirectInputDeviceW}, - {&IID_IDirectInputDevice2A}, - {&IID_IDirectInputDevice2W}, - {&IID_IDirectInputDevice7A}, - {&IID_IDirectInputDevice7W}, - {&IID_IDirectInputDevice8A}, - {&IID_IDirectInputDevice8W}, - {&IID_IDirectInputEffect}, + &IID_IDirectInputA, + &IID_IDirectInputW, + &IID_IDirectInput2A, + &IID_IDirectInput2W, + &IID_IDirectInput7A, + &IID_IDirectInput7W, + &IID_IDirectInputDeviceA, + &IID_IDirectInputDeviceW, + &IID_IDirectInputDevice2A, + &IID_IDirectInputDevice2W, + &IID_IDirectInputDevice7A, + &IID_IDirectInputDevice7W, + &IID_IDirectInputDevice8A, + &IID_IDirectInputDevice8W, + &IID_IDirectInputEffect, }; IDirectInput8A *pDI; @@ -292,21 +288,10 @@ static void test_QueryInterface(void) for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; - hr = IDirectInput8_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); - if (no_interface_list[i].test_todo) - { - todo_wine - ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr); - todo_wine - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); + hr = IDirectInput8_QueryInterface(pDI, no_interface_list[i], (void **)&pUnk); - if (pUnk) IUnknown_Release(pUnk); - } - else - { - ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } + ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } IDirectInput8_Release(pDI);

1 0

Michael Müller : avifil32: Correctly handle compressed frames when desired format is specified.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: da0f196c9348a80f04461d708b26db0f108dead6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0f196c9348a80f04461d70… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 2 02:43:03 2019 +0200 avifil32: Correctly handle compressed frames when desired format is specified. From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/getframe.c | 102 +++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index be4a2a9..2e61568 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -405,8 +405,6 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD)); if (lpbi->biBitCount <= 8) ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat); - - return AVIERR_OK; } else { if (bBestDisplay) { ICGetDisplayFormat(This->hic, This->lpInFormat, @@ -416,64 +414,64 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, AVIFILE_CloseCompressor(This); return AVIERR_NOCOMPRESSOR; } + } - /* check output format */ - if (This->lpOutFormat->biClrUsed == 0 && - This->lpOutFormat->biBitCount <= 8) - This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; - if (This->lpOutFormat->biSizeImage == 0 && - This->lpOutFormat->biCompression == BI_RGB) { - This->lpOutFormat->biSizeImage = - DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; - } + /* check output format */ + if (This->lpOutFormat->biClrUsed == 0 && + This->lpOutFormat->biBitCount <= 8) + This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; + if (This->lpOutFormat->biSizeImage == 0 && + This->lpOutFormat->biCompression == BI_RGB) { + This->lpOutFormat->biSizeImage = + DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; + } - if (lpBits == NULL) { - DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + if (lpBits == NULL) { + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); - size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; - This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); - if (This->lpOutFormat == NULL) { - AVIFILE_CloseCompressor(This); - return AVIERR_MEMORY; - } - This->lpOutBuffer = DIBPTR(This->lpOutFormat); - } else - This->lpOutBuffer = lpBits; - - /* for user size was irrelevant */ - if (dx == -1) - dx = This->lpOutFormat->biWidth; - if (dy == -1) - dy = This->lpOutFormat->biHeight; - - /* need to resize? */ - if (x != 0 || y != 0) { - if (dy == This->lpOutFormat->biHeight && - dx == This->lpOutFormat->biWidth) - This->bResize = FALSE; - else - This->bResize = TRUE; + size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; + This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); + if (This->lpOutFormat == NULL) { + AVIFILE_CloseCompressor(This); + return AVIERR_MEMORY; } + This->lpOutBuffer = DIBPTR(This->lpOutFormat); + } else + This->lpOutBuffer = lpBits; + + /* for user size was irrelevant */ + if (dx == -1) + dx = This->lpOutFormat->biWidth; + if (dy == -1) + dy = This->lpOutFormat->biHeight; + + /* need to resize? */ + if (x != 0 || y != 0) { + if (dy == This->lpOutFormat->biHeight && + dx == This->lpOutFormat->biWidth) + This->bResize = FALSE; + else + This->bResize = TRUE; + } - if (This->bResize) { - This->x = x; - This->y = y; - This->dx = dx; - This->dy = dy; - - if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, - 0,This->lpInFormat->biWidth, - This->lpInFormat->biHeight,This->lpOutFormat, - This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) - return AVIERR_OK; - } else if (ICDecompressBegin(This->hic, This->lpInFormat, - This->lpOutFormat) == ICERR_OK) + if (This->bResize) { + This->x = x; + This->y = y; + This->dx = dx; + This->dy = dy; + + if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, + 0,This->lpInFormat->biWidth, + This->lpInFormat->biHeight,This->lpOutFormat, + This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) return AVIERR_OK; + } else if (ICDecompressBegin(This->hic, This->lpInFormat, + This->lpOutFormat) == ICERR_OK) + return AVIERR_OK; - AVIFILE_CloseCompressor(This); + AVIFILE_CloseCompressor(This); - return AVIERR_COMPRESSOR; - } + return AVIERR_COMPRESSOR; } static const struct IGetFrameVtbl igetframeVtbl = {

1 0

Vijay Kiran Kamuju : include: Add missing defines, enums and functions for dwmapi.h.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: b479382737f9ee110bc61b1dd765c5b81d56c900 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b479382737f9ee110bc61b1d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu May 2 14:49:13 2019 +0200 include: Add missing defines, enums and functions for dwmapi.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwmapi.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/dwmapi.h b/include/dwmapi.h index b2f39de..99e7cae 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -34,9 +34,46 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; #include <pshpack1.h> +static const UINT c_DwmMaxQueuedBuffers = 8; +static const UINT c_DwmMaxMonitors = 16; +static const UINT c_DwmMaxAdapters = 16; + typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +enum DWMWINDOWATTRIBUTE { + DWMWA_NCRENDERING_ENABLED = 1, + DWMWA_NCRENDERING_POLICY, + DWMWA_TRANSITIONS_FORCEDISABLED, + DWMWA_ALLOW_NCPAINT, + DWMWA_CAPTION_BUTTON_BOUNDS, + DWMWA_NONCLIENT_RTL_LAYOUT, + DWMWA_FORCE_ICONIC_REPRESENTATION, + DWMWA_FLIP3D_POLICY, + DWMWA_EXTENDED_FRAME_BOUNDS, + DWMWA_HAS_ICONIC_BITMAP, + DWMWA_DISALLOW_PEEK, + DWMWA_EXCLUDED_FROM_PEEK, + DWMWA_CLOAK, + DWMWA_CLOAKED, + DWMWA_FREEZE_REPRESENTATION, + DWMWA_LAST +}; + +enum DWMNCRENDERINGPOLICY { + DWMNCRP_USEWINDOWSTYLE, + DWMNCRP_DISABLED, + DWMNCRP_ENABLED, + DWMNCRP_LAST +}; + +enum DWMFLIP3DWINDOWPOLICY { + DWMFLIP3D_DEFAULT, + DWMFLIP3D_EXCLUDEBELOW, + DWMFLIP3D_EXCLUDEABOVE, + DWMFLIP3D_LAST +}; + typedef enum _DWM_SOURCE_FRAME_SAMPLING { DWM_SOURCE_FRAME_SAMPLING_POINT, DWM_SOURCE_FRAME_SAMPLING_COVERAGE, @@ -101,6 +138,11 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#define DWM_FRAME_DURATION_DEFAULT -1 + +#define DWM_EC_DISABLECOMPOSITION 0 +#define DWM_EC_ENABLECOMPOSITION 1 + #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -113,6 +155,18 @@ typedef struct _DWM_BLURBEHIND BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +#define DWM_SIT_DISPLAYFRAME 0x00000001 + +#define DWM_CLOAKED_APP 0x00000001 +#define DWM_CLOAKED_SHELL 0x00000002 +#define DWM_CLOAKED_INHERITED 0x00000004 + +#define DWM_TNP_RECTDESTINATION 0x00000001 +#define DWM_TNP_RECTSOURCE 0x00000002 +#define DWM_TNP_OPACITY 0x00000004 +#define DWM_TNP_VISIBLE 0x00000008 +#define DWM_TNP_SOURCECLIENTAREAONLY 0x00000010 + typedef struct _DWM_THUMBNAIL_PROPERTIES { DWORD dwFlags; @@ -136,16 +190,25 @@ typedef struct _DWM_PRESENT_PARAMETERS { #include <poppack.h> +DWMAPI DwmAttachMilContent(HWND); DWMAPI_(BOOL) DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); +DWMAPI DwmDetachMilContent(HWND); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); +DWMAPI DwmFlush(void); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); +DWMAPI DwmGetGraphicsStreamClient(UINT, UUID *); +DWMAPI DwmGetGraphicsStreamTransformHint(UINT, MilMatrix3x2D *); +DWMAPI DwmGetTransportAttributes(BOOL*, BOOL*, DWORD*); +DWMAPI DwmGetWindowAttribute(HWND, DWORD, PVOID, DWORD); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetIconicLivePreviewBitmap(HWND, HBITMAP, POINT*, DWORD); +DWMAPI DwmSetIconicThumbnail(HWND, HBITMAP, DWORD); DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL);

1 0

Alexandre Julliard : explorer: Build with msvcrt.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: e5e79bb7aac02dade2aeb427744dfc89414871e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5e79bb7aac02dade2aeb427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:28:45 2019 +0200 explorer: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/Makefile.in | 3 ++- programs/explorer/appbar.c | 1 - programs/explorer/desktop.c | 45 ++++++++++++++++++++----------------------- programs/explorer/explorer.c | 17 ++++++++-------- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index a06887c..374c6aa 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -1,8 +1,9 @@ MODULE = explorer.exe -APPMODE = -mwindows -municode IMPORTS = rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ appbar.c \ desktop.c \ diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 329ef47..01dda7e 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -29,7 +29,6 @@ #include "windows.h" #include "shellapi.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "explorer_private.h" diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index f4cc7b1..2857fcf 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #define COBJMACROS @@ -31,7 +29,6 @@ #include <shellapi.h> #include "exdisp.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "explorer_private.h" @@ -249,10 +246,10 @@ static void do_launch( const struct launcher *launcher ) static WCHAR *append_path( const WCHAR *path, const WCHAR *filename, int len_filename ) { - int len_path = strlenW( path ); + int len_path = lstrlenW( path ); WCHAR *ret; - if (len_filename == -1) len_filename = strlenW( filename ); + if (len_filename == -1) len_filename = lstrlenW( filename ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len_path + len_filename + 2) * sizeof(WCHAR) ))) return NULL; memcpy( ret, path, len_path * sizeof(WCHAR) ); @@ -314,7 +311,7 @@ static WCHAR *build_title( const WCHAR *filename, int len ) const WCHAR *p; WCHAR *ret; - if (len == -1) len = strlenW( filename ); + if (len == -1) len = lstrlenW( filename ); for (p = filename + len - 1; p >= filename; p--) { if (*p == '.') @@ -381,7 +378,7 @@ static BOOL remove_launcher( const WCHAR *folder, const WCHAR *filename, int len if (!(path = append_path( folder, filename, len_filename ))) return FALSE; for (i = 0; i < nb_launchers; i++) { - if (!strcmpiW( launchers[i]->path, path )) + if (!wcsicmp( launchers[i]->path, path )) { free_launcher( launchers[i] ); if (--nb_launchers) @@ -514,14 +511,14 @@ error: static void add_folder( const WCHAR *folder ) { static const WCHAR lnkW[] = {'\\','*','.','l','n','k',0}; - int len = strlenW( folder ) + strlenW( lnkW ); + int len = lstrlenW( folder ) + lstrlenW( lnkW ); WIN32_FIND_DATAW data; HANDLE handle; WCHAR *glob; if (!(glob = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return; - strcpyW( glob, folder ); - strcatW( glob, lnkW ); + lstrcpyW( glob, folder ); + lstrcatW( glob, lnkW ); if ((handle = FindFirstFileW( glob, &data )) != INVALID_HANDLE_VALUE) { @@ -668,11 +665,11 @@ static BOOL parse_size( const WCHAR *size, unsigned int *width, unsigned int *he { WCHAR *end; - *width = strtoulW( size, &end, 10 ); + *width = wcstoul( size, &end, 10 ); if (end == size) return FALSE; if (*end != 'x') return FALSE; size = end + 1; - *height = strtoulW( size, &end, 10 ); + *height = wcstoul( size, &end, 10 ); return !*end; } @@ -691,7 +688,7 @@ static const WCHAR *get_default_desktop_name(void) if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, ARRAY_SIZE( buffer ), NULL )) { - if (strcmpiW( buffer, defaultW )) return buffer; + if (wcsicmp( buffer, defaultW )) return buffer; } /* @@ Wine registry key: HKCU\Software\Wine\Explorer */ @@ -779,7 +776,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (!driver) { - strcpyW( buffer, default_driver ); + lstrcpyW( buffer, default_driver ); /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ if (!RegOpenKeyW( HKEY_CURRENT_USER, driversW, &hkey )) @@ -794,10 +791,10 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) name = buffer; while (name) { - next = strchrW( name, ',' ); + next = wcschr( name, ',' ); if (next) *next++ = 0; - snprintfW( libname, ARRAY_SIZE( libname ), drv_formatW, name ); + swprintf( libname, ARRAY_SIZE( libname ), drv_formatW, name ); if ((module = LoadLibraryW( libname )) != 0) break; switch (GetLastError()) { @@ -820,7 +817,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); } - sprintfW( key, device_keyW, guid->Data1, guid->Data2, guid->Data3, + swprintf( key, ARRAY_SIZE(key), device_keyW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); @@ -829,7 +826,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { if (module) RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (strlenW(buffer) + 1) * sizeof(WCHAR) ); + (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); else RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey ); @@ -866,7 +863,7 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) return; } - window_title_len = strlenW(name) * sizeof(WCHAR) + window_title_len = lstrlenW(name) * sizeof(WCHAR) + sizeof(desktop_name_separatorW) + sizeof(desktop_nameW); window_titleW = HeapAlloc( GetProcessHeap(), 0, window_title_len ); @@ -876,9 +873,9 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) return; } - strcpyW( window_titleW, name ); - strcatW( window_titleW, desktop_name_separatorW ); - strcatW( window_titleW, desktop_nameW ); + lstrcpyW( window_titleW, name ); + lstrcatW( window_titleW, desktop_name_separatorW ); + lstrcatW( window_titleW, desktop_nameW ); SetWindowTextW( hwnd, window_titleW ); HeapFree( GetProcessHeap(), 0, window_titleW ); @@ -920,10 +917,10 @@ void manage_desktop( WCHAR *arg ) { arg++; name = arg; - if ((p = strchrW( arg, ',' ))) + if ((p = wcschr( arg, ',' ))) { *p++ = 0; - if ((driver = strchrW( p, ',' ))) *driver++ = 0; + if ((driver = wcschr( p, ',' ))) *driver++ = 0; } if (!p || !parse_size( p, &width, &height )) get_default_desktop_size( name, &width, &height ); diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 955678d..dcd09ac 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -22,7 +22,6 @@ #define COBJMACROS -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" #include "explorer_private.h" @@ -671,7 +670,7 @@ static WCHAR *copy_path_string(WCHAR *target, WCHAR *source) { INT i = 0; - while (isspaceW(*source)) source++; + while (iswspace(*source)) source++; if (*source == '\"') { @@ -735,23 +734,23 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) while (*p) { - while (isspaceW(*p)) p++; - if (strncmpW(p, arg_n, ARRAY_SIZE( arg_n ))==0) + while (iswspace(*p)) p++; + if (wcsncmp(p, arg_n, ARRAY_SIZE( arg_n ))==0) { parameters->explorer_mode = FALSE; p += ARRAY_SIZE( arg_n ); } - else if (strncmpW(p, arg_e, ARRAY_SIZE( arg_e ))==0) + else if (wcsncmp(p, arg_e, ARRAY_SIZE( arg_e ))==0) { parameters->explorer_mode = TRUE; p += ARRAY_SIZE( arg_e ); } - else if (strncmpW(p, arg_root, ARRAY_SIZE( arg_root ))==0) + else if (wcsncmp(p, arg_root, ARRAY_SIZE( arg_root ))==0) { p += ARRAY_SIZE( arg_root ); p = copy_path_string(parameters->root,p); } - else if (strncmpW(p, arg_select, ARRAY_SIZE( arg_select ))==0) + else if (wcsncmp(p, arg_select, ARRAY_SIZE( arg_select ))==0) { p += ARRAY_SIZE( arg_select ); p = copy_path_string(parameters->selection,p); @@ -759,13 +758,13 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) copy_path_root(parameters->root, parameters->selection); } - else if (strncmpW(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) + else if (wcsncmp(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) { p += ARRAY_SIZE( arg_desktop ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ - else if (strncmpW(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) + else if (wcsncmp(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) { p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */

1 0

Henri Verbeet : wined3d: Simplify wined3d_context_destroy().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 817f915bb3afb1c52afb7cac7276d63091a12d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=817f915bb3afb1c52afb7cac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:43:58 2019 +0430 wined3d: Simplify wined3d_context_destroy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 223e6b2..5978627 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2302,7 +2302,6 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, void wined3d_context_destroy(struct wined3d_context *context) { struct wined3d_device *device = context->device; - BOOL destroy; TRACE("Destroying ctx %p\n", context); @@ -2320,29 +2319,28 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - if (context->tid == GetCurrentThreadId() || !context->current) - { - context_destroy_gl_resources(context); - TlsSetValue(wined3d_context_tls_idx, NULL); - destroy = TRUE; - } - else + device->shader_backend->shader_free_context_data(context); + device->adapter->fragment_pipe->free_context_data(context); + heap_free(context->texture_type); + device_context_remove(device, context); + + if (context->current && context->tid != GetCurrentThreadId()) { - /* Make a copy of gl_info for context_destroy_gl_resources use, the one - in wined3d_adapter may go away in the meantime */ - struct wined3d_gl_info *gl_info = heap_alloc(sizeof(*gl_info)); + struct wined3d_gl_info *gl_info; + + /* Make a copy of gl_info for context_destroy_gl_resources() use, the + * one in wined3d_adapter may go away in the meantime. */ + gl_info = heap_alloc(sizeof(*gl_info)); *gl_info = *context->gl_info; context->gl_info = gl_info; context->destroyed = 1; - destroy = FALSE; + + return; } - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->texture_type); - device_context_remove(device, context); - if (destroy) - heap_free(context); + context_destroy_gl_resources(context); + TlsSetValue(wined3d_context_tls_idx, NULL); + heap_free(context); } const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context,

1 0

Henri Verbeet : wined3d: Rename context_destroy_gl_resources() to wined3d_context_cleanup().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 08b8801c3c0cf99665ad0120b3b127fa220336c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08b8801c3c0cf99665ad0120… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:43:59 2019 +0430 wined3d: Rename context_destroy_gl_resources() to wined3d_context_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5978627..3f9605c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1312,7 +1312,7 @@ static void context_update_window(struct wined3d_context *context) } } -static void context_destroy_gl_resources(struct wined3d_context *context) +static void wined3d_context_cleanup(struct wined3d_context *context) { struct wined3d_pipeline_statistics_query *pipeline_statistics_query; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1510,7 +1510,7 @@ BOOL context_set_current(struct wined3d_context *ctx) if (old->destroyed) { TRACE("Switching away from destroyed context %p.\n", old); - context_destroy_gl_resources(old); + wined3d_context_cleanup(old); heap_free((void *)old->gl_info); heap_free(old); } @@ -2328,7 +2328,7 @@ void wined3d_context_destroy(struct wined3d_context *context) { struct wined3d_gl_info *gl_info; - /* Make a copy of gl_info for context_destroy_gl_resources() use, the + /* Make a copy of gl_info for wined3d_context_cleanup() use, the * one in wined3d_adapter may go away in the meantime. */ gl_info = heap_alloc(sizeof(*gl_info)); *gl_info = *context->gl_info; @@ -2338,7 +2338,7 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - context_destroy_gl_resources(context); + wined3d_context_cleanup(context); TlsSetValue(wined3d_context_tls_idx, NULL); heap_free(context); }

1 0

Henri Verbeet : wined3d: Free the "texture_type" array in wined3d_context_cleanup().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 166e75e8080bc1705627add506eef6928ebb4325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=166e75e8080bc1705627add5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:00 2019 +0430 wined3d: Free the "texture_type" array in wined3d_context_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3f9605c..148d69f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1478,6 +1478,8 @@ static void wined3d_context_cleanup(struct wined3d_context *context) DWORD err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", context->glCtx, err); } + + heap_free(context->texture_type); } DWORD context_get_tls_idx(void) @@ -2321,7 +2323,6 @@ void wined3d_context_destroy(struct wined3d_context *context) device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->texture_type); device_context_remove(device, context); if (context->current && context->tid != GetCurrentThreadId())

1 0

Henri Verbeet : wined3d: Introduce wined3d_context_gl_destroy().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 6bb5724a8a7e347db7a4c05135bf01ba573b1563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bb5724a8a7e347db7a4c051… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:01 2019 +0430 wined3d: Introduce wined3d_context_gl_destroy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 46 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 148d69f..b239813 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1482,6 +1482,32 @@ static void wined3d_context_cleanup(struct wined3d_context *context) heap_free(context->texture_type); } +static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) +{ + wined3d_context_cleanup(&context_gl->c); +} + +static void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) +{ + if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) + { + struct wined3d_gl_info *gl_info; + + /* Make a copy of gl_info for wined3d_context_gl_cleanup() use, the + * one in wined3d_adapter may go away in the meantime. */ + gl_info = heap_alloc(sizeof(*gl_info)); + *gl_info = *context_gl->c.gl_info; + context_gl->c.gl_info = gl_info; + context_gl->c.destroyed = 1; + + return; + } + + wined3d_context_gl_cleanup(context_gl); + TlsSetValue(wined3d_context_tls_idx, NULL); + heap_free(context_gl); +} + DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -1512,7 +1538,7 @@ BOOL context_set_current(struct wined3d_context *ctx) if (old->destroyed) { TRACE("Switching away from destroyed context %p.\n", old); - wined3d_context_cleanup(old); + wined3d_context_gl_cleanup(wined3d_context_gl(old)); heap_free((void *)old->gl_info); heap_free(old); } @@ -2325,23 +2351,7 @@ void wined3d_context_destroy(struct wined3d_context *context) device->adapter->fragment_pipe->free_context_data(context); device_context_remove(device, context); - if (context->current && context->tid != GetCurrentThreadId()) - { - struct wined3d_gl_info *gl_info; - - /* Make a copy of gl_info for wined3d_context_cleanup() use, the - * one in wined3d_adapter may go away in the meantime. */ - gl_info = heap_alloc(sizeof(*gl_info)); - *gl_info = *context->gl_info; - context->gl_info = gl_info; - context->destroyed = 1; - - return; - } - - wined3d_context_cleanup(context); - TlsSetValue(wined3d_context_tls_idx, NULL); - heap_free(context); + wined3d_context_gl_destroy(wined3d_context_gl(context)); } const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 138cefb..e698c79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2034,6 +2034,11 @@ struct wined3d_context_gl struct wined3d_context c; }; +static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_gl, c); +} + struct wined3d_fb_state { struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS];

1 0

Henri Verbeet : wined3d: Free shader backend and fragment pipe context data in device_context_remove ().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: a9dca944cb6f54afc1a5e7f9ee283cfab808816e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9dca944cb6f54afc1a5e7f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:02 2019 +0430 wined3d: Free shader backend and fragment pipe context data in device_context_remove(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 -- dlls/wined3d/device.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b239813..4a73cbb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2347,8 +2347,6 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); device_context_remove(device, context); wined3d_context_gl_destroy(wined3d_context_gl(context)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e25565d..df491e1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -168,6 +168,9 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context TRACE("Removing context %p.\n", context); + device->adapter->fragment_pipe->free_context_data(context); + device->shader_backend->shader_free_context_data(context); + for (i = 0; i < device->context_count; ++i) { if (device->contexts[i] == context)

1 0

Henri Verbeet : wined3d: Allocate shader backend and fragment pipe context data in device_context_add ().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: ef3df93f465e302f841150b6382f5ff4e4870c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef3df93f465e302f841150b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:03 2019 +0430 wined3d: Allocate shader backend and fragment pipe context data in device_context_add(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 39 ++++++++------------------------------- dlls/wined3d/device.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4a73cbb..7e7ab09 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1925,19 +1925,6 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d list_init(&context->fbo_list); list_init(&context->fbo_destroy_list); - if (!device->shader_backend->shader_allocate_context_data(context)) - { - ERR("Failed to allocate shader backend context data.\n"); - return FALSE; - } - - if (!device->adapter->fragment_pipe->allocate_context_data(context)) - { - ERR("Failed to allocate fragment pipeline context data.\n"); - device->shader_backend->shader_free_context_data(context); - return FALSE; - } - if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); @@ -1945,8 +1932,6 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d if (!(context->hdc = swapchain_get_backup_dc(swapchain))) { ERR("Failed to retrieve a device context.\n"); - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); return FALSE; } context->hdc_is_private = TRUE; @@ -2001,31 +1986,23 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, heap_free(context_gl); return NULL; } - - if (!device_context_add(device, context)) + if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) { - ERR("Failed to add the newly created context to the context list\n"); - goto fail; + wined3d_release_dc(context->win_handle, context->hdc); + heap_free(context_gl); + return NULL; } - if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + if (!device_context_add(device, context)) { - device_context_remove(device, context); - goto fail; + ERR("Failed to add the newly created context to the context list\n"); + wined3d_context_gl_destroy(context_gl); + return NULL; } - device->shader_backend->shader_init_context_state(context); - TRACE("Created context %p.\n", context); return context; - -fail: - wined3d_release_dc(context->win_handle, context->hdc); - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); - heap_free(context_gl); - return NULL; } BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df491e1..a27251c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -149,14 +149,31 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c TRACE("Adding context %p.\n", context); + if (!device->shader_backend->shader_allocate_context_data(context)) + { + ERR("Failed to allocate shader backend context data.\n"); + return FALSE; + } + device->shader_backend->shader_init_context_state(context); + + if (!device->adapter->fragment_pipe->allocate_context_data(context)) + { + ERR("Failed to allocate fragment pipeline context data.\n"); + device->shader_backend->shader_free_context_data(context); + return FALSE; + } + if (!(new_array = heap_realloc(device->contexts, sizeof(*new_array) * (device->context_count + 1)))) { ERR("Failed to grow the context array.\n"); + device->adapter->fragment_pipe->free_context_data(context); + device->shader_backend->shader_free_context_data(context); return FALSE; } new_array[device->context_count++] = context; device->contexts = new_array; + return TRUE; }

1 0