June 2006 - Wine-commits - list.winehq.org

appdb/include filter.php
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26126 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 11:09:29 Modified files: include : filter.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Check for arrays when filtering. MAX_FILE_SIZE should not be filtered Patch: http://cvs.winehq.org/patch.py?id=26126 Old revision New revision Changes Path 1.1 1.2 +5 -1 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.1 appdb/include/filter.php:1.2 --- appdb/include/filter.php:1.1 29 Jun 2006 16: 9:29 -0000 +++ appdb/include/filter.php 29 Jun 2006 16: 9:29 -0000 @@ -37,8 +37,12 @@ function filter_gpc() break; } break; + case "a": // array + if(!is_array($_REQUEST[$aKeys[$i]])) + util_show_error_page("Fatal error: ".$aKeys[$i]." should be an array."); + break; default: - if($aKeys[$i]!="whq_appdb") // that's the name of the session cookie + if($aKeys[$i]!="whq_appdb" && $aKeys[$i]!="MAX_FILE_SIZE") // whq_appdb is the name of the session cookie util_show_error_page("Fatal error: type of variable ".$aKeys[$i]." is not recognized."); break; }

1 0

appdb/ ./appbrowse.php ./appsubmit.php ./appvi ...
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26125 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 11:07:20 Modified files: . : appbrowse.php appsubmit.php appview.php admin : adminAppDataQueue.php adminAppQueue.php adminMaintainers.php include : application.php bugs.php comment.php monitor.php note.php screenshot.php sidebar_login.php url.php util.php version.php vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up application and version classes. Move class related functions into the class as static member functions Patch: http://cvs.winehq.org/patch.py?id=26125 Old revision New revision Changes Path 1.13 1.14 +1 -1 appdb/appbrowse.php 1.43 1.44 +2 -2 appdb/appsubmit.php 1.82 1.83 +1 -1 appdb/appview.php 1.22 1.23 +6 -6 appdb/admin/adminAppDataQueue.php 1.57 1.58 +4 -4 appdb/admin/adminAppQueue.php 1.19 1.20 +3 -3 appdb/admin/adminMaintainers.php 1.50 1.51 +15 -53 appdb/include/application.php 1.10 1.11 +7 -5 appdb/include/bugs.php 1.21 1.22 +2 -2 appdb/include/comment.php 1.5 1.6 +10 -4 appdb/include/monitor.php 1.10 1.11 +4 -3 appdb/include/note.php 1.39 1.40 +7 -5 appdb/include/screenshot.php 1.13 1.14 +2 -2 appdb/include/sidebar_login.php 1.6 1.7 +7 -5 appdb/include/url.php 1.61 1.62 +18 -2 appdb/include/util.php 1.58 1.59 +47 -38 appdb/include/version.php 1.17 1.18 +2 -2 appdb/include/vote.php

1 0

appdb/ ./account.php ./appdbStats.php admin/ad ...
by WineHQ 29 Jun '06

29 Jun '06

ChangeSet ID: 26124 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/29 10:54:29 Modified files: . : account.php appdbStats.php admin : adminAppDataQueue.php cron : cleanup.php include : application.php bugs.php comment.php distributions.php monitor.php note.php screenshot.php testResults.php url.php user.php util.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Cleanup User class. Move user related functions into class as static member functions Patch: http://cvs.winehq.org/patch.py?id=26124 Old revision New revision Changes Path 1.19 1.20 +2 -2 appdb/account.php 1.9 1.10 +6 -6 appdb/appdbStats.php 1.21 1.22 +1 -1 appdb/admin/adminAppDataQueue.php 1.25 1.26 +4 -4 appdb/cron/cleanup.php 1.49 1.50 +1 -1 appdb/include/application.php 1.9 1.10 +1 -1 appdb/include/bugs.php 1.20 1.21 +2 -2 appdb/include/comment.php 1.7 1.8 +1 -1 appdb/include/distributions.php 1.4 1.5 +1 -1 appdb/include/monitor.php 1.9 1.10 +1 -1 appdb/include/note.php 1.38 1.39 +2 -2 appdb/include/screenshot.php 1.23 1.24 +1 -1 appdb/include/testResults.php 1.5 1.6 +1 -1 appdb/include/url.php 1.70 1.71 +175 -186 appdb/include/user.php 1.60 1.61 +2 -2 appdb/include/util.php 1.57 1.58 +1 -1 appdb/include/version.php

1 0

Dmitry Timoshkov : winex11.drv: Update window' s full screen state on the resolution
by Alexandre Julliard 29 Jun '06

29 Jun '06

Module: wine Branch: refs/heads/master Commit: 97c350b438cc2e054165fe52b7e303dbc2646ac5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97c350b438cc2e054165fe5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 29 17:44:53 2006 +0900 winex11.drv: Update window's full screen state on the resolution change as well as on the window resize event. --- dlls/winex11.drv/winpos.c | 34 +++++++++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e17180a..3c45fff 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -529,13 +529,13 @@ void X11DRV_SetWindowStyle( HWND hwnd, D * This only works for mapped windows. */ static void update_fullscreen_state( Display *display, struct x11drv_win_data *data, - const RECT *old_client_rect ) + const RECT *old_client_rect, const RECT *old_screen_rect ) { XEvent xev; BOOL old_fs_state = FALSE, new_fs_state = FALSE; - if (old_client_rect->left <= 0 && old_client_rect->right >= screen_width && - old_client_rect->top <= 0 && old_client_rect->bottom >= screen_height) + if (old_client_rect->left <= 0 && old_client_rect->right >= old_screen_rect->right && + old_client_rect->top <= 0 && old_client_rect->bottom >= old_screen_rect->bottom) old_fs_state = TRUE; if (data->client_rect.left <= 0 && data->client_rect.right >= screen_width && @@ -574,7 +574,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H const RECT *rectClient, UINT swp_flags, const RECT *valid_rects ) { struct x11drv_win_data *data; - RECT new_whole_rect, old_client_rect; + RECT new_whole_rect, old_client_rect, old_screen_rect; WND *win; DWORD old_style, new_style; BOOL ret; @@ -718,7 +718,8 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H XMapWindow( display, data->whole_window ); wine_tsx11_unlock(); } - update_fullscreen_state( display, data, &old_client_rect ); + SetRect( &old_screen_rect, 0, 0, screen_width, screen_height ); + update_fullscreen_state( display, data, &old_client_rect, &old_screen_rect ); } } } @@ -1220,16 +1221,36 @@ void X11DRV_UnmapNotify( HWND hwnd, XEve } +static BOOL CALLBACK update_windows_fullscreen_state( HWND hwnd, LPARAM lparam ) +{ + struct x11drv_win_data *data; + Display *display = thread_display(); + RECT *old_screen_rect = (RECT *)lparam; + + if ((data = X11DRV_get_win_data( hwnd )) && + (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + { + update_fullscreen_state( display, data, &data->client_rect, old_screen_rect ); + } + return TRUE; +} + + /*********************************************************************** * X11DRV_handle_desktop_resize */ void X11DRV_handle_desktop_resize( unsigned int width, unsigned int height ) { + unsigned int old_screen_width, old_screen_height; RECT rect; HWND hwnd = GetDesktopWindow(); struct x11drv_win_data *data; if (!(data = X11DRV_get_win_data( hwnd ))) return; + + old_screen_width = screen_width; + old_screen_height = screen_height; + screen_width = width; screen_height = height; TRACE("desktop %p change to (%dx%d)\n", hwnd, width, height); @@ -1239,6 +1260,9 @@ void X11DRV_handle_desktop_resize( unsig data->lock_changes--; SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_depth, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); + + SetRect( &rect, 0, 0, old_screen_width, old_screen_height ); + EnumWindows( update_windows_fullscreen_state, (LPARAM)&rect ); }

1 0

Maarten Lankhorst : cryptnet: Implement a stub cryptnet dll.
by Alexandre Julliard 29 Jun '06

29 Jun '06

Module: wine Branch: refs/heads/master Commit: d2ee3872e34a86a94cc1c1ec3377a6f83991a226 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2ee3872e34a86a94cc1c1e… Author: Maarten Lankhorst <M.B.Lankhorst(a)gmail.com> Date: Wed Jun 28 16:51:41 2006 +0200 cryptnet: Implement a stub cryptnet dll. --- configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/cryptnet/Makefile.in | 13 ++++++++ dlls/cryptnet/cryptnet.spec | 18 ++++++++++++ dlls/cryptnet/cryptnet_main.c | 64 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 99 insertions(+), 1 deletions(-) create mode 100644 dlls/cryptnet/Makefile.in create mode 100644 dlls/cryptnet/cryptnet.spec create mode 100644 dlls/cryptnet/cryptnet_main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d2ee3872e34a86a94cc…

1 0

Dmitry Timoshkov : include: Move appropriate parts of winpos.h to winuser. h and win.h,
by Alexandre Julliard 29 Jun '06

29 Jun '06

Module: wine Branch: refs/heads/master Commit: b2686ad2dd4aed8b2392ee2a3c2b608a492a0f26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2686ad2dd4aed8b2392ee2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 29 17:11:55 2006 +0900 include: Move appropriate parts of winpos.h to winuser.h and win.h, remove winpos.h afterwards. --- dlls/user/defwnd.c | 1 - dlls/user/dialog.c | 1 - dlls/user/message.c | 1 - dlls/user/nonclient.c | 1 - dlls/user/win.c | 1 - dlls/user/winpos.c | 1 - dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/winpos.c | 1 - include/win.h | 9 +++++++++ include/winpos.h | 44 -------------------------------------------- include/winuser.h | 5 +++++ 11 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 include/winpos.h diff --git a/dlls/user/defwnd.c b/dlls/user/defwnd.c index da38c63..c4339eb 100644 --- a/dlls/user/defwnd.c +++ b/dlls/user/defwnd.c @@ -33,7 +33,6 @@ #include "imm.h" #include "win.h" #include "user_private.h" #include "controls.h" -#include "winpos.h" #include "wine/unicode.h" #include "wine/winuser16.h" #include "wine/server.h" diff --git a/dlls/user/dialog.c b/dlls/user/dialog.c index baf72a6..6eaa942 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -38,7 +38,6 @@ #include "wine/winuser16.h" #include "wine/unicode.h" #include "controls.h" #include "win.h" -#include "winpos.h" #include "user_private.h" #include "wine/debug.h" diff --git a/dlls/user/message.c b/dlls/user/message.c index fde5fba..fd84ef0 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -38,7 +38,6 @@ #include "wine/unicode.h" #include "wine/server.h" #include "user_private.h" #include "win.h" -#include "winpos.h" #include "controls.h" #include "winproc.h" #include "wine/debug.h" diff --git a/dlls/user/nonclient.c b/dlls/user/nonclient.c index 2f095ca..00c2913 100644 --- a/dlls/user/nonclient.c +++ b/dlls/user/nonclient.c @@ -30,7 +30,6 @@ #include "wownt32.h" #include "win.h" #include "user_private.h" #include "controls.h" -#include "winpos.h" #include "shellapi.h" #include "wine/debug.h" diff --git a/dlls/user/win.c b/dlls/user/win.c index 593fef1..fa2af00 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -36,7 +36,6 @@ #include "win.h" #include "winproc.h" #include "user_private.h" #include "controls.h" -#include "winpos.h" #include "winerror.h" #include "wine/debug.h" diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index 0c23507..a3b7648 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -36,7 +36,6 @@ #include "wine/server.h" #include "controls.h" #include "user_private.h" #include "win.h" -#include "winpos.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6d7c595..2bc90a7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -43,7 +43,6 @@ #include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" #include "win.h" -#include "winpos.h" #include "mwm.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 80626b4..e17180a 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -38,7 +38,6 @@ #include "wine/wingdi16.h" #include "x11drv.h" #include "win.h" -#include "winpos.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/include/win.h b/include/win.h index 85c6e7e..bc7a4cb 100644 --- a/include/win.h +++ b/include/win.h @@ -106,4 +106,13 @@ #define WND_DESKTOP ((WND *)2) /* extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); +extern BOOL WINPOS_RedrawIconTitle( HWND hWnd ); +extern BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ); +extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack, + POINT *maxTrack ); +extern LONG WINPOS_HandleWindowPosChanging(HWND hwnd, WINDOWPOS *winpos); +extern HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ); +extern void WINPOS_CheckInternalPos( HWND hwnd ); +extern void WINPOS_ActivateOtherWindow( HWND hwnd ); + #endif /* __WINE_WIN_H */ diff --git a/include/winpos.h b/include/winpos.h deleted file mode 100644 index ea3008f..0000000 --- a/include/winpos.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * *DeferWindowPos() structure and definitions - * - * Copyright 1994 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WINPOS_H -#define __WINE_WINPOS_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> - -/* undocumented SWP flags - from SDK 3.1 */ -#define SWP_NOCLIENTSIZE 0x0800 -#define SWP_NOCLIENTMOVE 0x1000 -#define SWP_STATECHANGED 0x8000 - -extern BOOL WINPOS_RedrawIconTitle( HWND hWnd ); -extern BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ); -extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack, - POINT *maxTrack ); -extern LONG WINPOS_HandleWindowPosChanging(HWND hwnd, WINDOWPOS *winpos); -extern HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ); -extern void WINPOS_CheckInternalPos( HWND hwnd ); -extern void WINPOS_ActivateOtherWindow( HWND hwnd ); - -#endif /* __WINE_WINPOS_H */ diff --git a/include/winuser.h b/include/winuser.h index e6c5a28..cd83c5a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3155,6 +3155,11 @@ #define SWP_NOSENDCHANGING 0x0400 #define SWP_DEFERERASE 0x2000 #define SWP_ASYNCWINDOWPOS 0x4000 +/* undocumented SWP flags - from SDK 3.1 */ +#define SWP_NOCLIENTSIZE 0x0800 +#define SWP_NOCLIENTMOVE 0x1000 +#define SWP_STATECHANGED 0x8000 + #define HWND_DESKTOP ((HWND)0) #define HWND_BROADCAST ((HWND)0xffff)

1 0

Juan Lang : regedit: Update status bar after editing key name.
by Alexandre Julliard 29 Jun '06

29 Jun '06

Module: wine Branch: refs/heads/master Commit: 8daf5ad2aab1d5d61a566c0e813f44963b709361 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8daf5ad2aab1d5d61a566c0… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jun 28 18:06:39 2006 -0700 regedit: Update status bar after editing key name. --- programs/regedit/childwnd.c | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index d5edd40..c284d88 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -108,16 +108,14 @@ static LPTSTR CombinePaths(LPCTSTR pPath return combined; } -LPTSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { - LPCTSTR parts[3] = {_T(""), _T(""), _T("")}; +static LPTSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { + LPCTSTR parts[2] = {_T(""), _T("")}; TCHAR text[260]; HKEY hRootKey = NULL; if (!hItem) hItem = TreeView_GetSelection(hwndTV); - parts[2] = GetItemPath(hwndTV, hItem, &hRootKey); - if (!parts[2]) - parts[2] = _T(""); - if (!bFull && !hRootKey && !*parts[2]) + GetItemPath(hwndTV, hItem, &hRootKey); + if (!bFull && !hRootKey) return NULL; if (hRootKey) parts[1] = GetRootKeyName(hRootKey); @@ -126,7 +124,27 @@ LPTSTR GetItemFullPath(HWND hwndTV, HTRE GetComputerName(text, &dwSize); parts[0] = text; } - return CombinePaths(parts, 3); + return CombinePaths(parts, 2); +} + +LPTSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { + LPTSTR parts[2] = {_T(""), _T("")}; + HKEY hRootKey = NULL; + LPTSTR ret; + parts[0] = GetPathRoot(hwndTV, hItem, bFull); + parts[1] = GetItemPath(hwndTV, hItem, &hRootKey); + ret = CombinePaths((LPCTSTR *)parts, 2); + HeapFree(GetProcessHeap(), 0, parts[0]); + return ret; +} + +LPTSTR GetPathFullPath(HWND hwndTV, LPTSTR path) { + LPTSTR parts[2] = {_T(""), _T("")}, ret; + parts[0] = GetPathRoot(hwndTV, 0, TRUE); + parts[1] = path; + ret = CombinePaths((LPCTSTR *)parts, 2); + HeapFree(GetProcessHeap(), 0, parts[0]); + return ret; } static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BOOL bRefreshLV) @@ -317,10 +335,14 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); if (res) { TVITEMEX item; + LPTSTR fullPath = GetPathFullPath(pChildWnd->hTreeWnd, + dispInfo->item.pszText); item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = TreeView_GetSelection(pChildWnd->hTreeWnd); item.pszText = dispInfo->item.pszText; SendMessage( pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); + SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath); + HeapFree(GetProcessHeap(), 0, fullPath); } return res; }

1 0

Jason Green : wined3d: Fix a few GLSL shader instruction translations.
by Alexandre Julliard 29 Jun '06

29 Jun '06

Module: wine Branch: refs/heads/master Commit: 4fbe97e5e70a1cee5789d4b8adc872fad13f34c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fbe97e5e70a1cee5789d4b… Author: Jason Green <jave27(a)gmail.com> Date: Wed Jun 28 18:32:47 2006 -0400 wined3d: Fix a few GLSL shader instruction translations. This fixes the translations for a few instructions in GLSL and allows Cubemap sampling in pixel shaders < 2.0. It makes some of the lighting on textures in Half Life 2 look better, including some of the water effects. It's not perfect yet, but much closer now. --- dlls/wined3d/baseshader.c | 15 ++++++++++++--- dlls/wined3d/glsl_shader.c | 15 +++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 36c0497..e9e3097 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -377,13 +377,22 @@ void shader_get_registers_used( (D3DSIO_TEX == curOpcode->opcode || D3DSIO_TEXBEM == curOpcode->opcode || D3DSIO_TEXM3x2TEX == curOpcode->opcode || - D3DSIO_TEXM3x3TEX == curOpcode->opcode || - D3DSIO_TEXM3x3SPEC == curOpcode->opcode || - D3DSIO_TEXM3x3VSPEC == curOpcode->opcode)) { + D3DSIO_TEXM3x3TEX == curOpcode->opcode)) { /* Fake sampler usage, only set reserved bit and ttype */ DWORD sampler_code = *pToken & D3DSP_REGNUM_MASK; reg_maps->samplers[sampler_code] = (0x1 << 31) | D3DSTT_2D; + + } else if (D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) == 1 && + (D3DSIO_TEXM3x3SPEC == curOpcode->opcode || + D3DSIO_TEXM3x3VSPEC == curOpcode->opcode)) { + + /* 3D sampler usage, only set reserved bit and ttype + * FIXME: This could be either Cube or Volume, but we wouldn't know unless + * we waited to generate the shader until the textures were all bound. + * For now, use Cube textures because they are more common. */ + DWORD sampler_code = *pToken & D3DSP_REGNUM_MASK; + reg_maps->samplers[sampler_code] = (0x1 << 31) | D3DSTT_CUBE; } /* This will loop over all the registers and try to diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cc6609..94871c0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1049,8 +1049,8 @@ void shader_glsl_lrp(SHADER_OPCODE_ARG* shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); - shader_addline(arg->buffer, "%s(%s * (%s - %s) + %s))%s;\n", - tmpLine, src2_str, src1_str, src0_str, src0_str, dst_mask); + shader_addline(arg->buffer, "%s%s + %s * (%s - %s))%s;\n", + tmpLine, src2_str, src0_str, src1_str, src2_str, dst_mask); } /** Process the D3DSIO_DEF opcode into a GLSL string - creates a local vec4 @@ -1292,7 +1292,7 @@ void pshader_glsl_texm3x3pad(SHADER_OPCO char src0_mask[6]; shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_name, src0_mask, src0_str); - shader_addline(buffer, "tmp%i.x = dot(vec3(T%lu), vec3(%s));\n", current_state->current_row, reg, src0_str); + shader_addline(buffer, "tmp0.%c = dot(vec3(T%lu), vec3(%s));\n", 'x' + current_state->current_row, reg, src0_str); current_state->texcoord_w[current_state->current_row++] = reg; } @@ -1328,7 +1328,7 @@ void pshader_glsl_texm3x3vspec(SHADER_OP /* Construct the eye-ray vector from w coordinates */ shader_addline(buffer, "tmp1.x = gl_TexCoord[%lu].w;\n", current_state->texcoord_w[0]); - shader_addline(buffer, "tmp1.x = gl_TexCoord[%lu].w;\n", current_state->texcoord_w[1]); + shader_addline(buffer, "tmp1.y = gl_TexCoord[%lu].w;\n", current_state->texcoord_w[1]); shader_addline(buffer, "tmp1.z = gl_TexCoord[%lu].w;\n", reg); /* Calculate reflection vector (Assume normal is normalized): RF = 2*(N.E)*N -E */ @@ -1337,14 +1337,13 @@ void pshader_glsl_texm3x3vspec(SHADER_OP shader_addline(buffer, "tmp0 = (2.0 * tmp0) - tmp1;\n"); /* FIXME: - * The ARB_fragment_program implementation uses Cube texture lookups here, but that is just a guess. + * We don't really know if a Cube or a Volume texture is being sampled, but since Cube textures + * are used more commonly, we'll default to that. * We probably need to push back the pixel shader generation code until drawPrimitive() for * shader versions < 2.0, since that's the only time we can guarantee that we're sampling * the correct type of texture because we can lookup what textures are bound at that point. - * For now, just sample the texture as if it's 2D. */ - FIXME("Incorrect dimensionality for pixel shader texm3x3vspec instruction.\n"); - shader_addline(buffer, "T%lu = texture2D(Psampler%lu, tmp0.xy);\n", reg, reg); + shader_addline(buffer, "T%lu = textureCube(Psampler%lu, tmp0.xyz);\n", reg, reg); current_state->current_row = 0; }

1 0

Robert Shearman : ole32: When marshaling a proxy make sure to maintain an external
by Alexandre Julliard 29 Jun '06

29 Jun '06

Module: wine Branch: refs/heads/master Commit: 2f0e714a2779b4ccca397cad67835afe64b94cfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f0e714a2779b4ccca397ca… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 28 21:25:14 2006 +0100 ole32: When marshaling a proxy make sure to maintain an external reference on the stub object so that the first proxy can be released. Implement external refcount sharing between a proxy and the marshaled proxy. Extend the marshaling of a proxy test to show that an external reference is always kept on the stub object. --- dlls/ole32/marshal.c | 44 +++++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/marshal.c | 38 ++++++++++++++++++++++++++++++-------- 2 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 12e886d..152647b 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -379,11 +379,49 @@ static HRESULT WINAPI Proxy_MarshalInter if (SUCCEEDED(hr)) { STDOBJREF stdobjref = ifproxy->stdobjref; - /* FIXME: optimization - share out proxy's public references if possible + ULONG cPublicRefs = ifproxy->refs; + ULONG cPublicRefsOld; + + /* optimization - share out proxy's public references if possible * instead of making new proxy do a roundtrip through the server */ - stdobjref.cPublicRefs = 0; /* InterlockedDecrement(&This->stdobjref.cPublicRefs) >= 0 ? 1 : 0 */ + do + { + ULONG cPublicRefsNew; + cPublicRefsOld = cPublicRefs; + stdobjref.cPublicRefs = cPublicRefs / 2; + cPublicRefsNew = cPublicRefs - stdobjref.cPublicRefs; + cPublicRefs = InterlockedCompareExchange( + (LONG *)&ifproxy->refs, cPublicRefsNew, cPublicRefsOld); + } while (cPublicRefs != cPublicRefsOld); + + if (!stdobjref.cPublicRefs) + { + IRemUnknown *remunk; + hr = proxy_manager_get_remunknown(This, &remunk); + if (hr == S_OK) + { + HRESULT hrref = S_OK; + REMINTERFACEREF rif; + rif.ipid = ifproxy->stdobjref.ipid; + rif.cPublicRefs = NORMALEXTREFS; + rif.cPrivateRefs = 0; + hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); + if (hr == S_OK && hrref == S_OK) + stdobjref.cPublicRefs = rif.cPublicRefs; + else + ERR("IRemUnknown_RemAddRef returned with 0x%08lx, hrref = 0x%08lx\n", hr, hrref); + } + } - hr = IStream_Write(pStm, &stdobjref, sizeof(stdobjref), NULL); + if (SUCCEEDED(hr)) + { + TRACE("writing stdobjref:\n\tflags = %04lx\n\tcPublicRefs = %ld\n\toxid = %s\n\toid = %s\n\tipid = %s\n", + stdobjref.flags, stdobjref.cPublicRefs, + wine_dbgstr_longlong(stdobjref.oxid), + wine_dbgstr_longlong(stdobjref.oid), + debugstr_guid(&stdobjref.ipid)); + hr = IStream_Write(pStm, &stdobjref, sizeof(stdobjref), NULL); + } } else { diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 24f9268..102be87 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -434,6 +434,10 @@ static void test_interthread_marshal_and end_host_object(tid, thread); } +/* the number of external references that Wine's proxy manager normally gives + * out, so we can test the border case of running out of references */ +#define NORMALEXTREFS 5 + /* tests success case of an interthread marshal and then marshaling the proxy */ static void test_proxy_marshal_and_unmarshal(void) { @@ -443,6 +447,7 @@ static void test_proxy_marshal_and_unmar IUnknown *pProxy2 = NULL; DWORD tid; HANDLE thread; + int i; cLocks = 0; @@ -465,14 +470,26 @@ static void test_proxy_marshal_and_unmar ok_more_than_one_lock(); + /* marshal 5 more times to exhaust the normal external references of 5 */ + for (i = 0; i < NORMALEXTREFS; i++) + { + hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + } + + ok_more_than_one_lock(); + + /* release the original proxy to test that we successfully keep the + * original object alive */ + IUnknown_Release(pProxy); + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - /* unmarshal the second proxy to the object */ hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy2); ok_ole_success(hr, CoUnmarshalInterface); - IStream_Release(pStream); + + ok_more_than_one_lock(); /* now the proxies should be as follows: - * pProxy -> &Test_ClassFactory * pProxy2 -> &Test_ClassFactory * they should NOT be as follows: * pProxy -> &Test_ClassFactory @@ -480,16 +497,21 @@ static void test_proxy_marshal_and_unmar * the above can only really be tested by looking in +ole traces */ - ok_more_than_one_lock(); - - IUnknown_Release(pProxy); + IUnknown_Release(pProxy2); - ok_more_than_one_lock(); + /* unmarshal all of the proxies to check that the object stub still exists */ + for (i = 0; i < NORMALEXTREFS; i++) + { + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy2); + ok_ole_success(hr, CoUnmarshalInterface); - IUnknown_Release(pProxy2); + IUnknown_Release(pProxy2); + } ok_no_locks(); + IStream_Release(pStream); + end_host_object(tid, thread); }

1 0

Robert Shearman : ole32: Add a test for CoCreateInstance doing object hosting by
by Alexandre Julliard 29 Jun '06

29 Jun '06

Module: wine Branch: refs/heads/master Commit: 723aceb20f8b759340074592da7d3ca4d201fe0b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=723aceb20f8b75934007459… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 28 21:24:58 2006 +0100 ole32: Add a test for CoCreateInstance doing object hosting by automatically creating an appropriate apartment for the object and returning a proxy to it. --- dlls/ole32/tests/marshal.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index a1be2c3..24f9268 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -26,6 +26,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "shlguid.h" #include "wine/test.h" @@ -59,6 +60,26 @@ static void test_CoGetPSClsid(void) hr); } +static void test_cocreateinstance_proxy(void) +{ + IUnknown *pProxy; + IMultiQI *pMQI; + HRESULT hr; + + pCoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_ShellDesktop, NULL, CLSCTX_INPROC, &IID_IUnknown, (void **)&pProxy); + ok_ole_success(hr, CoCreateInstance); + hr = IUnknown_QueryInterface(pProxy, &IID_IMultiQI, (void **)&pMQI); + todo_wine + ok(hr == S_OK, "created object is not a proxy, so was created in the wrong apartment\n"); + if (hr == S_OK) + IMultiQI_Release(pMQI); + IUnknown_Release(pProxy); + + CoUninitialize(); +} + static const LARGE_INTEGER ullZero; static LONG cLocks; @@ -2214,6 +2235,8 @@ START_TEST(marshal) wndclass.lpszClassName = "WineCOMTest"; RegisterClass(&wndclass); + test_cocreateinstance_proxy(); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); /* FIXME: test CoCreateInstanceEx */

1 0