March 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Reset the cursor window when re-creating the client window.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 51d3d620cfa1e13d30eb9738676e9a9369579987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d3d620cfa1e13d30eb97386… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 5 20:52:14 2008 +0100 winex11: Reset the cursor window when re-creating the client window. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b98c6d8..3f3ac99 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -246,6 +246,8 @@ static Window create_client_window( Display *display, struct x11drv_win_data *da if (data->client_window) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + if (thread_data->cursor_window == data->client_window) thread_data->cursor_window = None; XDeleteContext( display, data->client_window, winContext ); XDestroyWindow( display, data->client_window ); }

1 0

Huw Davies : shell32: ABM_GETAUTOHIDEBAR should return a HWND or NULL.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: b24ec72f89a01f1bdf0d8573e88d25f5bd7b0903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24ec72f89a01f1bdf0d8573e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 5 12:07:05 2008 +0000 shell32: ABM_GETAUTOHIDEBAR should return a HWND or NULL. --- dlls/shell32/shell32_main.c | 7 +++++-- dlls/shell32/tests/systray.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index c53d726..ac9019a 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -882,6 +882,10 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) int height=data->rc.bottom - data->rc.top; RECT rec=data->rc; + TRACE("msg=%d, data={cb=%d, hwnd=%p, callback=%x, edge=%d, rc=%s, lparam=%lx}\n", + msg, data->cbSize, data->hWnd, data->uCallbackMessage, data->uEdge, + wine_dbgstr_rect(&data->rc), data->lParam); + switch (msg) { case ABM_GETSTATE: @@ -894,8 +898,7 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) SetActiveWindow(data->hWnd); return TRUE; case ABM_GETAUTOHIDEBAR: - data->hWnd=GetActiveWindow(); - return TRUE; + return 0; /* pretend there is no autohide bar */ case ABM_NEW: /* cbSize, hWnd, and uCallbackMessage are used. All other ignored */ SetWindowPos(data->hWnd,HWND_TOP,0,0,0,0,SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE); diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 23e1ba3..f1cd62b 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -75,6 +75,40 @@ void test_cbsize(void) ok(!Shell_NotifyIconA(NIM_DELETE, &nidA), "The icon was not deleted\n"); } +static void test_SHAppBarMessage(void) +{ + APPBARDATA abd; + HWND hwnd, foregnd; + + memset(&abd, 0xcc, sizeof(abd)); + abd.cbSize = sizeof(abd); + abd.uEdge = ABE_BOTTOM; + + hwnd = (HWND)SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd); + ok(hwnd == NULL || IsWindow(hwnd), "ret %p which is not a window\n", hwnd); + ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); + + /* Presumably one can pass a hwnd with ABM_GETAUTOHIDEBAR to specify a monitor. + Pass the foreground window and check */ + foregnd = GetForegroundWindow(); + if(foregnd) + { + abd.hWnd = foregnd; + hwnd = (HWND)SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd); + ok(hwnd == NULL || IsWindow(hwnd), "ret %p which is not a window\n", hwnd); + ok(abd.hWnd == foregnd, "hWnd overwritten\n"); + if(hwnd) + { + HMONITOR appbar_mon, foregnd_mon; + appbar_mon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + foregnd_mon = MonitorFromWindow(foregnd, MONITOR_DEFAULTTONEAREST); + ok(appbar_mon == foregnd_mon, "Windows on different monitors\n"); + } + } + + return; +} + START_TEST(systray) { WNDCLASSA wc; @@ -110,4 +144,6 @@ START_TEST(systray) DispatchMessageA(&msg); } DestroyWindow(hMainWnd); + + test_SHAppBarMessage(); }

1 0

Huw Davies : shell32: Add a test for ABM_GETTASKBARPOS.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: f372280928f587ad4e1228c499bbfffde3b9cea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f372280928f587ad4e1228c49… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 5 12:31:25 2008 +0000 shell32: Add a test for ABM_GETTASKBARPOS. --- dlls/shell32/shell32_main.c | 4 +++- dlls/shell32/tests/systray.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index ac9019a..4c2735b 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -882,7 +882,7 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) int height=data->rc.bottom - data->rc.top; RECT rec=data->rc; - TRACE("msg=%d, data={cb=%d, hwnd=%p, callback=%x, edge=%d, rc=%s, lparam=%lx}\n", + FIXME("msg=%d, data={cb=%d, hwnd=%p, callback=%x, edge=%d, rc=%s, lparam=%lx}: stub\n", msg, data->cbSize, data->hWnd, data->uCallbackMessage, data->uEdge, wine_dbgstr_rect(&data->rc), data->lParam); @@ -891,6 +891,8 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) case ABM_GETSTATE: return ABS_ALWAYSONTOP | ABS_AUTOHIDE; case ABM_GETTASKBARPOS: + /* FIXME: This is wrong. It should return the taskbar co-ords and edge from the monitor + which contains data->hWnd */ GetWindowRect(data->hWnd, &rec); data->rc=rec; return TRUE; diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index f1cd62b..f7fc747 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -79,6 +79,7 @@ static void test_SHAppBarMessage(void) { APPBARDATA abd; HWND hwnd, foregnd; + UINT_PTR ret; memset(&abd, 0xcc, sizeof(abd)); abd.cbSize = sizeof(abd); @@ -106,6 +107,19 @@ static void test_SHAppBarMessage(void) } } + memset(&abd, 0xcc, sizeof(abd)); + abd.cbSize = sizeof(abd); + ret = SHAppBarMessage(ABM_GETTASKBARPOS, &abd); + if(ret) + { + ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); +todo_wine +{ + ok(abd.uEdge >= ABE_LEFT && abd.uEdge <= ABE_BOTTOM, "uEdge not returned\n"); + ok(abd.rc.left != 0xcccccccc, "rc not updated\n"); +} + } + return; }

1 0

Huw Davies : fonts: Start of a 9 pixel high strike for Tahoma.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 6e2b8a743f11e588c32f424c0e940487bb063b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2b8a743f11e588c32f424c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 5 16:54:01 2008 +0000 fonts: Start of a 9 pixel high strike for Tahoma. --- fonts/tahoma.sfd | 666 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 666 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e2b8a743f11e588c32f4…

1 0

Tony Wasserka : d3dx9: Implement D3DXDebugMute.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 459b92a0091d19be36faf10be1a569c89f3c6d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459b92a0091d19be36faf10be… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Feb 23 20:30:57 2008 +0100 d3dx9: Implement D3DXDebugMute. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_36_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 1a26ebc..c859e94 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -117,7 +117,7 @@ @ stub D3DXCreateVolumeTextureFromResourceExA @ stub D3DXCreateVolumeTextureFromResourceExW @ stub D3DXCreateVolumeTextureFromResourceW -@ stub D3DXDebugMute +@ stdcall D3DXDebugMute(long) @ stub D3DXDeclaratorFromFVF @ stub D3DXDisassembleEffect @ stub D3DXDisassembleShader diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/d3dx9_36_main.c index 1857eb9..6a98c60 100644 --- a/dlls/d3dx9_36/d3dx9_36_main.c +++ b/dlls/d3dx9_36/d3dx9_36_main.c @@ -66,6 +66,15 @@ BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) } /*********************************************************************** + * D3DXDebugMute + * Returns always FALSE for us. + */ +BOOL WINAPI D3DXDebugMute(BOOL mute) +{ + return FALSE; +} + +/*********************************************************************** * D3DXGetDriverLevel. * Returns always 900 (DX 9) for us */

1 0

Hans Leidekker : gdi32: Move GetICMProfile to the driver.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 81e9b43fb246a07793d62563a826c9c3bbfa767f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e9b43fb246a07793d62563a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Mar 5 15:57:21 2008 +0100 gdi32: Move GetICMProfile to the driver. --- dlls/gdi32/driver.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/icm.c | 49 ++++++-------------------------- dlls/gdi32/mfdrv/init.c | 1 + dlls/winex11.drv/graphics.c | 57 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 1 + 7 files changed, 71 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 31810b0..8d75803 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -116,6 +116,7 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(GetDIBits); GET_FUNC(GetDeviceCaps); GET_FUNC(GetDeviceGammaRamp); + GET_FUNC(GetICMProfile); GET_FUNC(GetNearestColor); GET_FUNC(GetPixel); GET_FUNC(GetPixelFormat); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 0db9ff6..2203ced 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -75,6 +75,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = NULL, /* pGetDIBits */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ + NULL, /* pGetICMProfile */ NULL, /* pGetNearestColor */ NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index dc66a0c..e3a320a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -140,6 +140,7 @@ typedef struct tagDC_FUNCS INT (*pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT); INT (*pGetDeviceCaps)(PHYSDEV,INT); BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID); + BOOL (*pGetICMProfile)(PHYSDEV,LPDWORD,LPWSTR); COLORREF (*pGetNearestColor)(PHYSDEV,COLORREF); COLORREF (*pGetPixel)(PHYSDEV,INT,INT); INT (*pGetPixelFormat)(PHYSDEV); diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index 12d1f3b..0e346ee 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -30,6 +30,8 @@ #include "winnls.h" #include "winreg.h" +#include "gdi_private.h" + #include "wine/debug.h" #include "wine/unicode.h" @@ -97,51 +99,18 @@ BOOL WINAPI GetICMProfileA(HDC hdc, LPDWORD size, LPSTR filename) */ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename) { - HKEY hkey; - DWORD required; - WCHAR profile[MAX_PATH], fullname[MAX_PATH]; - static const WCHAR path[] = - {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s', - '\\','c','o','l','o','r','\\',0}; - static const WCHAR srgb[] = - {'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ', - 'P','r','o','f','i','l','e','.','i','c','m',0}; - static const WCHAR mntr[] = - {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t', - 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r',0}; + BOOL ret = FALSE; + DC *dc = get_dc_ptr(hdc); TRACE("%p, %p, %p\n", hdc, size, filename); - if (!hdc || !size) return FALSE; - - strcpyW(profile, srgb); - if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, mntr, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL)) - { - DWORD size = sizeof(profile) / sizeof(WCHAR); - /* FIXME handle multiple values */ - RegEnumValueW(hkey, 0, profile, &size, NULL, NULL, NULL, NULL); - RegCloseKey(hkey); - } - GetSystemDirectoryW(fullname, MAX_PATH); - strcatW(fullname, path); - strcatW(fullname, profile); - - required = strlenW(fullname) + 1; - if (*size < required) - { - *size = required; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - if (filename) + if (dc) { - strcpyW(filename, fullname); - if (GetFileAttributesW(filename) == INVALID_FILE_ATTRIBUTES) - WARN("color profile not found\n"); + if (dc->funcs->pGetICMProfile) + ret = dc->funcs->pGetICMProfile(dc->physDev, size, filename); + release_dc_ptr(dc); } - *size = required; - return TRUE; + return ret; } /********************************************************************** diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index c2cf404..69e5b55 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -75,6 +75,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = NULL, /* pGetDIBits */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ + NULL, /* pGetICMProfile */ NULL, /* pGetNearestColor */ NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */ diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index e580fd6..5272681 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -25,6 +25,7 @@ #include "config.h" +#include <stdarg.h> #include <math.h> #ifdef HAVE_FLOAT_H # include <float.h> @@ -35,9 +36,14 @@ #endif #include <string.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" + #include "x11drv.h" #include "x11font.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(graphics); @@ -1374,3 +1380,54 @@ DWORD X11DRV_SetDCOrg( X11DRV_PDEVICE *physDev, INT x, INT y ) physDev->dc_rect.top = y - physDev->drawable_rect.top; return ret; } + +/*********************************************************************** + * GetICMProfile (X11DRV.@) + */ +BOOL X11DRV_GetICMProfile( X11DRV_PDEVICE *physDev, LPDWORD size, LPWSTR filename ) +{ + static const WCHAR path[] = + {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s', + '\\','c','o','l','o','r','\\',0}; + static const WCHAR srgb[] = + {'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ', + 'P','r','o','f','i','l','e','.','i','c','m',0}; + static const WCHAR mntr[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t', + 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r',0}; + + HKEY hkey; + DWORD required; + WCHAR profile[MAX_PATH], fullname[MAX_PATH]; + + if (!size) return FALSE; + + strcpyW( profile, srgb ); + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, mntr, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL )) + { + DWORD len = sizeof(profile)/sizeof(WCHAR); + /* FIXME handle multiple values */ + RegEnumValueW( hkey, 0, profile, &len, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + } + GetSystemDirectoryW( fullname, MAX_PATH ); + strcatW( fullname, path ); + strcatW( fullname, profile ); + + required = strlenW( fullname ) + 1; + if (*size < required) + { + *size = required; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (filename) + { + strcpyW( filename, fullname ); + if (GetFileAttributesW( filename ) == INVALID_FILE_ATTRIBUTES) + WARN( "color profile not found\n" ); + } + *size = required; + return TRUE; +} diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 6c8fe6c..751da52 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -22,6 +22,7 @@ @ cdecl GetDIBits(ptr long long long ptr ptr long) X11DRV_GetDIBits @ cdecl GetDeviceCaps(ptr long) X11DRV_GetDeviceCaps @ cdecl GetDeviceGammaRamp(ptr ptr) X11DRV_GetDeviceGammaRamp +@ cdecl GetICMProfile(ptr ptr ptr) X11DRV_GetICMProfile @ cdecl GetNearestColor(ptr long) X11DRV_GetNearestColor @ cdecl GetPixel(ptr long long) X11DRV_GetPixel @ cdecl GetPixelFormat(ptr) X11DRV_GetPixelFormat

1 0

Hans Leidekker : winex11.drv: Retrieve X color profile in GetICMProfile.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 22f146f01115a03a55fbe2e32f63f3be4d38da06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f146f01115a03a55fbe2e32… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Mar 5 15:57:39 2008 +0100 winex11.drv: Retrieve X color profile in GetICMProfile. --- dlls/winex11.drv/graphics.c | 84 +++++++++++++++++++++++++++++++++++----- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 5272681..e75b594 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1381,6 +1381,39 @@ DWORD X11DRV_SetDCOrg( X11DRV_PDEVICE *physDev, INT x, INT y ) return ret; } +static unsigned char *get_icm_profile( unsigned long *size ) +{ + Atom type; + int format; + unsigned long count, remaining; + unsigned char *profile, *ret = NULL; + + wine_tsx11_lock(); + XGetWindowProperty( gdi_display, DefaultRootWindow(gdi_display), + x11drv_atom(_ICC_PROFILE), 0, ~0UL, False, AnyPropertyType, + &type, &format, &count, &remaining, &profile ); + if (format && count) + { + *size = count * (format / 8); + if ((ret = HeapAlloc( GetProcessHeap(), 0, *size ))) memcpy( ret, profile, *size ); + XFree( profile ); + } + wine_tsx11_unlock(); + return ret; +} + +typedef struct +{ + unsigned int unknown[6]; + unsigned int state[5]; + unsigned int count[2]; + unsigned char buffer[64]; +} sha_ctx; + +extern void WINAPI A_SHAInit( sha_ctx * ); +extern void WINAPI A_SHAUpdate( sha_ctx *, const unsigned char *, unsigned int ); +extern void WINAPI A_SHAFinal( sha_ctx *, unsigned char * ); + /*********************************************************************** * GetICMProfile (X11DRV.@) */ @@ -1398,22 +1431,53 @@ BOOL X11DRV_GetICMProfile( X11DRV_PDEVICE *physDev, LPDWORD size, LPWSTR filenam 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r',0}; HKEY hkey; - DWORD required; - WCHAR profile[MAX_PATH], fullname[MAX_PATH]; + DWORD required, len; + WCHAR profile[MAX_PATH], fullname[2*MAX_PATH + sizeof(path)/sizeof(WCHAR)]; + unsigned char *buffer; + unsigned long buflen; if (!size) return FALSE; - strcpyW( profile, srgb ); - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, mntr, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL )) + GetSystemDirectoryW( fullname, MAX_PATH ); + strcatW( fullname, path ); + + len = sizeof(profile)/sizeof(WCHAR); + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, mntr, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL ) && + !RegEnumValueW( hkey, 0, profile, &len, NULL, NULL, NULL, NULL )) /* FIXME handle multiple values */ { - DWORD len = sizeof(profile)/sizeof(WCHAR); - /* FIXME handle multiple values */ - RegEnumValueW( hkey, 0, profile, &len, NULL, NULL, NULL, NULL ); + strcatW( fullname, profile ); RegCloseKey( hkey ); } - GetSystemDirectoryW( fullname, MAX_PATH ); - strcatW( fullname, path ); - strcatW( fullname, profile ); + else if ((buffer = get_icm_profile( &buflen ))) + { + static const WCHAR fmt[] = {'%','0','2','x',0}; + static const WCHAR icm[] = {'.','i','c','m',0}; + + unsigned char sha1sum[20]; + unsigned int i; + sha_ctx ctx; + HANDLE file; + + A_SHAInit( &ctx ); + A_SHAUpdate( &ctx, buffer, buflen ); + A_SHAFinal( &ctx, sha1sum ); + + for (i = 0; i < sizeof(sha1sum); i++) sprintfW( &profile[i * 2], fmt, sha1sum[i] ); + memcpy( &profile[i * 2], icm, sizeof(icm) ); + + strcatW( fullname, profile ); + file = CreateFileW( fullname, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0 ); + if (file != INVALID_HANDLE_VALUE) + { + DWORD written; + + if (!WriteFile( file, buffer, buflen, &written, NULL ) || written != buflen) + ERR( "Unable to write color profile\n" ); + CloseHandle( file ); + } + HeapFree( GetProcessHeap(), 0, buffer ); + } + else strcatW( fullname, srgb ); required = strlenW( fullname ) + 1; if (*size < required) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2ef2f1f..4111866 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -564,6 +564,7 @@ enum x11drv_atoms XATOM_KWM_DOCKWINDOW, XATOM_DndProtocol, XATOM_DndSelection, + XATOM__ICC_PROFILE, XATOM__MOTIF_WM_HINTS, XATOM__KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR, XATOM__NET_SYSTEM_TRAY_OPCODE, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 50d4546..9162857 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -128,6 +128,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "KWM_DOCKWINDOW", "DndProtocol", "DndSelection", + "_ICC_PROFILE", "_MOTIF_WM_HINTS", "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", "_NET_SYSTEM_TRAY_OPCODE",

1 0

Alexandre Julliard : user32: Added stubs for Cascade/TileChildWindows.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: b383690f5213abb95014b8342fae9c02f26e953f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b383690f5213abb95014b8342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 5 19:21:30 2008 +0100 user32: Added stubs for Cascade/TileChildWindows. --- dlls/user32/mdi.c | 19 +++++++++++++++++++ dlls/user32/user32.spec | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 4145944..60297b0 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1888,6 +1888,15 @@ CascadeWindows (HWND hwndParent, UINT wFlags, const RECT *lpRect, } +/*********************************************************************** + * CascadeChildWindows (USER32.@) + */ +WORD WINAPI CascadeChildWindows( HWND parent, UINT flags ) +{ + return CascadeWindows( parent, flags, NULL, 0, NULL ); +} + + /****************************************************************************** * TileWindows (USER32.@) Tiles MDI child windows * @@ -1903,6 +1912,16 @@ TileWindows (HWND hwndParent, UINT wFlags, const RECT *lpRect, return 0; } + +/*********************************************************************** + * TileChildWindows (USER32.@) + */ +WORD WINAPI TileChildWindows( HWND parent, UINT flags ) +{ + return TileWindows( parent, flags, NULL, 0, NULL ); +} + + /************************************************************************ * "More Windows..." functionality */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 77b9ad7..5848fc2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -28,7 +28,7 @@ @ stdcall CallNextHookEx(long long long long) @ stdcall CallWindowProcA(ptr long long long long) @ stdcall CallWindowProcW(ptr long long long long) -@ stub CascadeChildWindows +@ stdcall CascadeChildWindows(long long) @ stdcall CascadeWindows(long long ptr long ptr) @ stdcall ChangeClipboardChain(long long) @ stdcall ChangeDisplaySettingsA(ptr long) @@ -698,7 +698,7 @@ @ stdcall SystemParametersInfoW(long long ptr long) @ stdcall TabbedTextOutA(long long long str long long ptr long) @ stdcall TabbedTextOutW(long long long wstr long long ptr long) -@ stub TileChildWindows +@ stdcall TileChildWindows(long long) @ stdcall TileWindows(long long ptr long ptr) @ stdcall ToAscii(long long ptr ptr long) @ stdcall ToAsciiEx(long long ptr ptr long long)

1 0

Stefan Dösinger : wined3d: Add a number to the ARB program shader bumpenvmat matrices.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 739278baf1292dd670b10788ce8f9dc78f1f4a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=739278baf1292dd670b10788c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 1 17:26:49 2008 +0100 wined3d: Add a number to the ARB program shader bumpenvmat matrices. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 75899e7..67f5b0d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -276,12 +276,12 @@ void shader_generate_arb_declarations( */ if(max_constantsF < GL_LIMITS(pshader_constantsF)) { ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst = max_constantsF; - shader_addline(buffer, "PARAM bumpenvmat = program.env[%d];\n", ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst); + shader_addline(buffer, "PARAM bumpenvmat%d = program.env[%d];\n", reg_maps->bumpmat, ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst); if(reg_maps->luminanceparams != -1 && max_constantsF +1 < GL_LIMITS(pshader_constantsF)) { extra_constants_needed += 1; ((IWineD3DPixelShaderImpl *)This)->luminanceconst = max_constantsF + 1; - shader_addline(buffer, "PARAM luminance = program.env[%d];\n", ((IWineD3DPixelShaderImpl *)This)->luminanceconst); + shader_addline(buffer, "PARAM luminance%d = program.env[%d];\n", reg_maps->luminanceparams, ((IWineD3DPixelShaderImpl *)This)->luminanceconst); } else if(reg_maps->luminanceparams != -1) { FIXME("No free constant to load the luminance parameters\n"); } @@ -890,6 +890,8 @@ void pshader_hw_bem(SHADER_OPCODE_ARG* arg) { char dst_name[50]; char src_name[2][50]; char dst_wmask[20]; + DWORD sampler_code = arg->dst & WINED3DSP_REGNUM_MASK; + BOOL has_bumpmat = (This->bumpenvmatconst != -1); pshader_get_register_name(arg->shader, arg->dst, dst_name); shader_arb_get_write_mask(arg, arg->dst, dst_wmask); @@ -898,11 +900,11 @@ void pshader_hw_bem(SHADER_OPCODE_ARG* arg) { pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[0], 0, src_name[0]); pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[1], 1, src_name[1]); - if(This->bumpenvmatconst != -1) { + if(has_bumpmat) { /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ - shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); + shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, x, z, 0, 0;\n", sampler_code); shader_addline(buffer, "DP3 TMP.r, TMP2, %s;\n", src_name[1]); - shader_addline(buffer, "SWZ TMP2, bumpenvmat, y, w, 0, 0;\n"); + shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, y, w, 0, 0;\n", sampler_code); shader_addline(buffer, "DP3 TMP.g, TMP2, %s;\n", src_name[1]); shader_addline(buffer, "ADD %s, %s, TMP;\n", dst_name, src_name[0]); @@ -1232,6 +1234,9 @@ void pshader_hw_texreg2rgb(SHADER_OPCODE_ARG* arg) { void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + DWORD sampler_code = arg->dst & WINED3DSP_REGNUM_MASK; + BOOL has_bumpmat = (This->bumpenvmatconst != -1); + BOOL has_luminance = (This->luminanceconst != -1); DWORD dst = arg->dst; DWORD src = arg->src[0] & WINED3DSP_REGNUM_MASK; @@ -1245,12 +1250,12 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { /* Can directly use the name because texbem is only valid for <= 1.3 shaders */ pshader_get_register_name(arg->shader, dst, reg_coord); - if(This->bumpenvmatconst != -1) { + if(has_bumpmat) { /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ - shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); + shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, x, z, 0, 0;\n", sampler_code); shader_addline(buffer, "DP3 TMP.r, TMP2, T%u;\n", src); - shader_addline(buffer, "SWZ TMP2, bumpenvmat, y, w, 0, 0;\n"); + shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, y, w, 0, 0;\n", sampler_code); shader_addline(buffer, "DP3 TMP.g, TMP2, T%u;\n", src); /* with projective textures, texbem only divides the static texture coord, not the displacement, @@ -1267,8 +1272,9 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP", FALSE, FALSE); - if(arg->opcode->opcode == WINED3DSIO_TEXBEML && This->luminanceconst != -1) { - shader_addline(buffer, "MAD TMP, T%u.z, luminance.x, luminance.y;\n", src); + if(arg->opcode->opcode == WINED3DSIO_TEXBEML && has_luminance) { + shader_addline(buffer, "MAD TMP, T%u.z, luminance%d.x, luminance%d.y;\n", + src, sampler_code, sampler_code); shader_addline(buffer, "MUL %s, %s, TMP;\n", reg_coord, reg_coord); }

1 0

Stefan Dösinger : wined3d: Support more than one texbem instruction per shader.
by Alexandre Julliard 05 Mar '08

05 Mar '08

Module: wine Branch: master Commit: 167a271434b4f30acfa1560ce4fadb4fa5d8ed07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167a271434b4f30acfa1560ce… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 5 03:18:55 2008 +0100 wined3d: Support more than one texbem instruction per shader. --- dlls/wined3d/arb_program_shader.c | 96 +++++++++++++++++++++++++------------ dlls/wined3d/baseshader.c | 25 ++++------ dlls/wined3d/glsl_shader.c | 72 +++++++++++++++++++-------- dlls/wined3d/pixelshader.c | 2 - dlls/wined3d/state.c | 7 +-- dlls/wined3d/wined3d_private.h | 19 +++++--- 6 files changed, 139 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=167a271434b4f30acfa15…

1 0