February 2008 - Wine-Commits

Roderick Colenbrander : wgl: Remove the pixel format limitation.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 8293a9ead0ddbc40be62815f0f0823356665b3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8293a9ead0ddbc40be62815f0… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Feb 22 20:40:00 2008 +0000 wgl: Remove the pixel format limitation. --- dlls/winex11.drv/opengl.c | 91 +++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 48 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3531918..d685b94 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -829,17 +829,10 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) static BOOL init_formats(Display *display, int screen, Visual *visual) { - int fmt_id, tmp_fmt_id, nCfgs, i; + int fmt_id, nCfgs, i, run; GLXFBConfig* cfgs; - GLXFBConfig fbconfig = NULL; XVisualInfo *visinfo; - VisualID visualid = XVisualIDFromVisual(visual); - int nOffscreenFormats = 0; - /* As mentioned in various parts of the code only the format of the main visual can be used for onscreen rendering. - * Next to this format there are also so called offscreen rendering formats (used for pbuffers) which can be supported - * because they don't need a visual. Below we use glXGetFBConfigs instead of glXChooseFBConfig to enumerate the fb configurations - * because this call lists both types of formats instead of only onscreen ones. */ cfgs = pglXGetFBConfigs(display, DefaultScreen(display), &nCfgs); if (NULL == cfgs || 0 == nCfgs) { ERR("glXChooseFBConfig returns NULL\n"); @@ -847,48 +840,50 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) return FALSE; } - /* Count the number of offscreen formats to determine the size for our pixelformat list */ - for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); + WineGLPixelFormatList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCfgs*sizeof(WineGLPixelFormat)); - visinfo = pglXGetVisualFromFBConfig(display, cfgs[i]); - /* Onscreen formats have a corresponding XVisual, offscreen ones don't */ - if(!visinfo) { - nOffscreenFormats++; - } else if(visinfo && visinfo->visualid == visualid) { + /* Fill the pixel format list. Put onscreen formats at the top and offscreen ones at the bottom. + * Do this as GLX doesn't guarantee that the list is sorted */ + for(run=0; run < 2; run++) + { + for(i=0; i<nCfgs; i++) { pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &fmt_id); - fbconfig = cfgs[i]; - XFree(visinfo); - } - } - TRACE("Number of offscreen formats: %d\n", nOffscreenFormats); - - /* Allocate memory for all the offscreen pixelformats and the format of Wine's main visual */ - WineGLPixelFormatList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (1+nOffscreenFormats)*sizeof(WineGLPixelFormat)); - WineGLPixelFormatList[0].iPixelFormat = 1; - WineGLPixelFormatList[0].fbconfig = fbconfig; - WineGLPixelFormatList[0].fmt_id = fmt_id; - WineGLPixelFormatList[0].render_type = get_render_type_from_fbconfig(display, fbconfig); - WineGLPixelFormatList[0].offscreenOnly = FALSE; - WineGLPixelFormatListSize = 1; - WineGLPixelFormatOnScreenSize = 1; - - /* Fill the list with offscreen formats */ - for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); - - visinfo = pglXGetVisualFromFBConfig(display, cfgs[i]); - /* We have found an offscreen rendering format when there is no visualinfo :) */ - if(!visinfo) { - TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize+1, i); - WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ - WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; - WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = tmp_fmt_id; - WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); - WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE; - WineGLPixelFormatListSize++; - } else { - XFree(visinfo); + visinfo = pglXGetVisualFromFBConfig(display, cfgs[i]); + + /* The first run we only add onscreen formats (ones which have an associated X Visual). + * The second run we only set offscreen formats. */ + if(!run && visinfo) + { + /* We implement child window rendering using offscreen buffers (using composite or an XPixmap). + * The contents is copied to the destination using XCopyArea. For the copying to work + * the depth of the source and destination window should be the same. In general this should + * not be a problem for OpenGL as drivers only advertise formats with a similar depth (or no depth). + * As of the introduction of composition managers at least Nvidia now also offers ARGB visuals + * with a depth of 32 in addition to the default 24 bit. In order to prevent BadMatch errors we only + * list formats with the same depth. */ + if(visinfo->depth != screen_depth) + continue; + + TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, WineGLPixelFormatListSize+1, i); + WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ + WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; + WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = fmt_id; + WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); + + WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = FALSE; + WineGLPixelFormatListSize++; + WineGLPixelFormatOnScreenSize++; + XFree(visinfo); + } else if(run && !visinfo) { + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, WineGLPixelFormatListSize+1, i); + WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ + WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; + WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = fmt_id; + WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); + + WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE; + WineGLPixelFormatListSize++; + } } }

1 0

Roderick Colenbrander : wined3d: Request alpha in backbuffer mode, to work correctly with multiple opengl pixel formats.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 68467cf344e51f0ee0773d7e876916a4f8998e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68467cf344e51f0ee0773d7e8… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Feb 22 23:27:38 2008 +0000 wined3d: Request alpha in backbuffer mode, to work correctly with multiple opengl pixel formats. --- dlls/wined3d/context.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 19d2f30..769949a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -210,6 +210,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar int attribs[256]; int nAttribs = 0; unsigned int nFormats; + WINED3DFORMAT fmt = target->resource.format; hdc = GetDC(win_handle); if(hdc == NULL) { @@ -224,7 +225,15 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar PUSH2(WGL_SUPPORT_OPENGL_ARB, GL_TRUE); PUSH2(WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB); /* Make sure we receive an accelerated format. On windows (at least on ATI) this is not always the case */ - if(!getColorBits(target->resource.format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { + /* In case of ORM_BACKBUFFER, make sure to request an alpha component for X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ + if(wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { + if(target->resource.format == WINED3DFMT_X4R4G4B4) + fmt = WINED3DFMT_A4R4G4B4; + else if(target->resource.format == WINED3DFMT_X8R8G8B8) + fmt = WINED3DFMT_A8R8G8B8; + } + + if(!getColorBits(fmt, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { ERR("Unable to get color bits for format %#x!\n", target->resource.format); return FALSE; }

1 0

Rob Shearman : comctl32: Rename the dwStyle and dwOldStyle variables in LISTVIEW_SetExtendedListViewStyle to more accurately reflect their purpose .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 7f33e95ca7afc9792b232626e1d29361e8404153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f33e95ca7afc9792b232626e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 22 19:17:13 2008 +0000 comctl32: Rename the dwStyle and dwOldStyle variables in LISTVIEW_SetExtendedListViewStyle to more accurately reflect their purpose. This also fixes local variable shadowing in the function, which should be avoided for purposes of code readability. --- dlls/comctl32/listview.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 006991f..9f4bd7b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6985,17 +6985,17 @@ static HIMAGELIST LISTVIEW_CreateCheckBoxIL(const LISTVIEW_INFO *infoPtr) * SUCCESS : previous style * FAILURE : 0 */ -static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwMask, DWORD dwStyle) +static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwMask, DWORD dwExStyle) { - DWORD dwOldStyle = infoPtr->dwLvExStyle; + DWORD dwOldExStyle = infoPtr->dwLvExStyle; /* set new style */ if (dwMask) - infoPtr->dwLvExStyle = (dwOldStyle & ~dwMask) | (dwStyle & dwMask); + infoPtr->dwLvExStyle = (dwOldExStyle & ~dwMask) | (dwExStyle & dwMask); else - infoPtr->dwLvExStyle = dwStyle; + infoPtr->dwLvExStyle = dwExStyle; - if((infoPtr->dwLvExStyle ^ dwOldStyle) & LVS_EX_CHECKBOXES) + if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_CHECKBOXES) { HIMAGELIST himl = 0; if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) @@ -7011,7 +7011,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); } - if((infoPtr->dwLvExStyle ^ dwOldStyle) & LVS_EX_HEADERDRAGDROP) + if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERDRAGDROP) { DWORD dwStyle = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); if (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) @@ -7021,7 +7021,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, dwStyle); } - return dwOldStyle; + return dwOldExStyle; } /***

1 0

Rob Shearman : shdocvw: Add more keys to the CLSID_Internet key.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: c6c5e991afb80e584198429d4966089931e4000c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c5e991afb80e584198429d4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 22 19:17:56 2008 +0000 shdocvw: Add more keys to the CLSID_Internet key. --- dlls/shdocvw/shdocvw.inf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index ed7b39e..c959737 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -71,8 +71,12 @@ HKCR,"Shell.UIHelper.1",,,"" HKCR,"Shell.UIHelper.1\CLSID",,,"%CLSID_ShellUIHelper%" HKCR,"CLSID\%CLSID_Internet%",,,"Internet Explorer" +HKCR,"CLSID\%CLSID_Internet%\DefaultIcon",,,"shdoclc.dll,-190" HKCR,"CLSID\%CLSID_Internet%\InProcServer32",,,"%MODULE%" HKCR,"CLSID\%CLSID_Internet%\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\%CLSID_Internet%\Shell",,,"OpenHomePage" +HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage",,,"Open &Home Page" +HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe""" HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" HKCR,"CLSID\%CLSID_WebBrowser%",,,"Microsoft Web Browser"

1 0

Rob Shearman : shdocvw: The default value for the "CLSID\%CLSID_Internet" key isn't set on Windows, so we shouldn't set it either.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: e7c1d5d1738ccd03662c59598b2361e88b276992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c1d5d1738ccd03662c59598… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 22 19:40:04 2008 +0000 shdocvw: The default value for the "CLSID\%CLSID_Internet" key isn't set on Windows, so we shouldn't set it either. --- dlls/shdocvw/shdocvw.inf | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index c959737..57df7cb 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -70,7 +70,6 @@ HKCR,"Shell.UIHelper\CurVer",,,"Shell.UIHelper.2" HKCR,"Shell.UIHelper.1",,,"" HKCR,"Shell.UIHelper.1\CLSID",,,"%CLSID_ShellUIHelper%" -HKCR,"CLSID\%CLSID_Internet%",,,"Internet Explorer" HKCR,"CLSID\%CLSID_Internet%\DefaultIcon",,,"shdoclc.dll,-190" HKCR,"CLSID\%CLSID_Internet%\InProcServer32",,,"%MODULE%" HKCR,"CLSID\%CLSID_Internet%\InProcServer32","ThreadingModel",,"Apartment"

1 0

Rob Shearman : comctl32: Fix the signedness of i, oldNumParts and nTipCount in STATUSBAR_SetParts.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: e145242671f577748521410f37a87fc198f977f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e145242671f577748521410f3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 22 19:17:24 2008 +0000 comctl32: Fix the signedness of i, oldNumParts and nTipCount in STATUSBAR_SetParts. --- dlls/comctl32/status.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 2551e0a..e704635 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -668,7 +668,7 @@ static BOOL STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) { STATUSWINDOWPART *tmp; - int i, oldNumParts; + UINT i, oldNumParts; TRACE("(%d,%p)\n", count, parts); @@ -700,7 +700,7 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) infoPtr->parts[i].x = parts[i]; if (infoPtr->hwndToolTip) { - INT nTipCount, i; + UINT nTipCount; TTTOOLINFOW ti; ZeroMemory (&ti, sizeof(TTTOOLINFOW));

1 0

Rob Shearman : comctl32: Fix local variable shadowing in load_string by moving len to the block in which it is actually used .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 45f13cefc439c254fd7ab0bf03405945f7898757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f13cefc439c254fd7ab0bf0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 22 19:17:19 2008 +0000 comctl32: Fix local variable shadowing in load_string by moving len to the block in which it is actually used. --- dlls/comctl32/propsheet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index f2b704f..a193082 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2898,7 +2898,6 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh) static LPWSTR load_string( HINSTANCE instance, LPCWSTR str ) { LPWSTR ret; - UINT len; if (IS_INTRESOURCE(str)) { @@ -2906,6 +2905,7 @@ static LPWSTR load_string( HINSTANCE instance, LPCWSTR str ) HGLOBAL hmem; WCHAR *ptr; WORD i, id = LOWORD(str); + UINT len; if (!(hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((id >> 4) + 1), (LPWSTR)RT_STRING ))) return NULL;

1 0

Rob Shearman : shdocvw: Fix quoting of double-quote in shdocvw.inf.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 23c896abd7295d61b95ce5c214fca1d65b223159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c896abd7295d61b95ce5c21… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 22 19:18:02 2008 +0000 shdocvw: Fix quoting of double-quote in shdocvw.inf. --- dlls/shdocvw/shdocvw.inf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 7ed20d8..ed7b39e 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -120,8 +120,8 @@ HKCR,"InternetShortcut","NeverShowExt",, HKCR,"InternetShortcut\CLSID",,,"%CLSID_InteretShortcut%" HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0" HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l" -HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\"" -HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\" \"%2\" \"%3\" \"%4\"" +HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1""" +HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1"" ""%2"" ""%3"" ""%4""" [Settings.Reg]

1 0

Hans Leidekker : mscms: Assume read sharing when no sharing flags are specified in OpenColorProfile .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: fb0e62eef0c1242eb466241242260c6014996b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0e62eef0c1242eb46624124… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Feb 22 16:19:51 2008 +0100 mscms: Assume read sharing when no sharing flags are specified in OpenColorProfile. --- dlls/mscms/profile.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index d7e8c76..af636ef 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1397,11 +1397,12 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (access & PROFILE_READWRITE) flags = GENERIC_READ|GENERIC_WRITE; if (!flags) return NULL; + if (!sharing) sharing = FILE_SHARE_READ; handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); if (handle == INVALID_HANDLE_VALUE) { - WARN( "Unable to open color profile\n" ); + WARN( "Unable to open color profile %u\n", GetLastError() ); return NULL; }

1 0

Hans Leidekker : mscms: Add tests for AssociateColorProfileWithDevice and DisassociateColorProfileFromDevice .
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: dbdf9278e8f826dacbf59f767f9dad6706f52e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdf9278e8f826dacbf59f767… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Feb 22 14:24:59 2008 +0100 mscms: Add tests for AssociateColorProfileWithDevice and DisassociateColorProfileFromDevice. --- dlls/mscms/tests/profile.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 5e5dbab..d7e1f6a 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -32,7 +32,9 @@ HMODULE hmscms; +static BOOL (WINAPI *pAssociateColorProfileWithDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pCloseColorProfile)(HPROFILE); +static BOOL (WINAPI *pDisassociateColorProfileFromDeviceA)(PCSTR,PCSTR,PCSTR); static BOOL (WINAPI *pGetColorDirectoryA)(PCHAR,PCHAR,PDWORD); static BOOL (WINAPI *pGetColorDirectoryW)(PWCHAR,PWCHAR,PDWORD); static BOOL (WINAPI *pGetColorProfileElement)(HPROFILE,TAGTYPE,DWORD,PDWORD,PVOID,PBOOL); @@ -61,7 +63,9 @@ static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); static BOOL init_function_ptrs( void ) { + GETFUNCPTR( AssociateColorProfileWithDeviceA ) GETFUNCPTR( CloseColorProfile ) + GETFUNCPTR( DisassociateColorProfileFromDeviceA ) GETFUNCPTR( GetColorDirectoryA ) GETFUNCPTR( GetColorDirectoryW ) GETFUNCPTR( GetColorProfileElement ) @@ -1353,6 +1357,71 @@ static void test_UninstallColorProfileW(void) } } +static void test_AssociateColorProfileWithDeviceA(void) +{ + BOOL ret; + char profile[MAX_PATH], basename[MAX_PATH]; + DWORD error, size = sizeof(profile); + + if (testprofile) + { + SetLastError(0xdeadbeef); + ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, NULL ); + error = GetLastError(); + ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = pAssociateColorProfileWithDeviceA( "machine", NULL, "DISPLAY" ); + error = GetLastError(); + ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = pAssociateColorProfileWithDeviceA( "machine", testprofile, "DISPLAY" ); + error = GetLastError(); + ok( !ret, "AssociateColorProfileWithDevice() succeeded\n" ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + + ret = pInstallColorProfileA( NULL, testprofile ); + ok( ret, "InstallColorProfileA() failed (%u)\n", GetLastError() ); + + ret = pGetColorDirectoryA( NULL, profile, &size ); + ok( ret, "GetColorDirectoryA() failed (%d)\n", GetLastError() ); + + MSCMS_basenameA( testprofile, basename ); + lstrcatA( profile, "\\" ); + lstrcatA( profile, basename ); + + ret = pAssociateColorProfileWithDeviceA( NULL, profile, "DISPLAY" ); + ok( ret, "AssociateColorProfileWithDevice() failed (%u)\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pDisassociateColorProfileFromDeviceA( "machine", profile, NULL ); + error = GetLastError(); + ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = pDisassociateColorProfileFromDeviceA( "machine", NULL, "DISPLAY" ); + error = GetLastError(); + ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error ); + + SetLastError(0xdeadbeef); + ret = pDisassociateColorProfileFromDeviceA( "machine", profile, "DISPLAY" ); + error = GetLastError(); + ok( !ret, "DisassociateColorProfileFromDeviceA() succeeded\n" ); + ok( error == ERROR_NOT_SUPPORTED, "expected ERROR_NOT_SUPPORTED, got %u\n", error ); + + ret = pDisassociateColorProfileFromDeviceA( NULL, profile, "DISPLAY" ); + ok( ret, "DisassociateColorProfileFromDeviceA() failed (%u)\n", GetLastError() ); + + ret = pUninstallColorProfileA( NULL, profile, TRUE ); + ok( ret, "UninstallColorProfileW() failed (%d)\n", GetLastError() ); + } +} + START_TEST(profile) { UINT len; @@ -1457,6 +1526,8 @@ START_TEST(profile) test_UninstallColorProfileA(); test_UninstallColorProfileW(); + test_AssociateColorProfileWithDeviceA(); + /* Clean up */ if (testprofile) DeleteFileA( testprofile );

1 0