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

Ivan Gyurdiev : wined3d: Reverse semantics maps for shaders.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 5b3c500efe3b633e28fda4a3afa6a105e17197b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b3c500efe3b633e28fda4a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Fri Jul 7 00:27:38 2006 -0600 wined3d: Reverse semantics maps for shaders. --- dlls/wined3d/arb_program_shader.c | 11 --- dlls/wined3d/baseshader.c | 128 +---------------------------- dlls/wined3d/drawprim.c | 162 +++++++++++++------------------------ dlls/wined3d/glsl_shader.c | 130 +++++++++++++----------------- dlls/wined3d/vertexshader.c | 31 +++++++ dlls/wined3d/wined3d_private.h | 29 +++++-- 6 files changed, 174 insertions(+), 317 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5b3c500efe3b633e28f…

1 0

Ivan Gyurdiev : wined3d: Simplify primitiveDeclartationConvertToStrided.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: c202bfe40d3c3904f1d2b8af99ac89241e0d0aa4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c202bfe40d3c3904f1d2b8a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Fri Jul 7 00:24:24 2006 -0600 wined3d: Simplify primitiveDeclartationConvertToStrided. Assign fixed indices to declaration inputs. Then use a common path to load the strided data. --- dlls/wined3d/drawprim.c | 254 +++++++++++------------------------------- include/wine/wined3d_types.h | 8 + 2 files changed, 75 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c202bfe40d3c3904f1d…

1 0

Ivan Gyurdiev : wined3d: Make WINED3D_ATR macros more flexible.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: c611012df50e7a66a8996b69b3f6f22d94747c6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c611012df50e7a66a8996b6… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Fri Jul 7 00:25:14 2006 -0600 wined3d: Make WINED3D_ATR macros more flexible. Make them operate on a type, as opposed to a semantic name. --- dlls/wined3d/drawprim.c | 85 ++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 10 ++--- 2 files changed, 55 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c611012df50e7a66a89…

1 0

Ivan Gyurdiev : wined3d: Add position_transformed flag to Strided data format.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 85aa8ab85508111444de4b409a79144ccf1262f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85aa8ab85508111444de4b4… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Fri Jul 7 07:15:20 2006 -0600 wined3d: Add position_transformed flag to Strided data format. --- dlls/ddraw/device.c | 4 +- dlls/wined3d/drawprim.c | 96 ++++++++++++++++------------------------ dlls/wined3d/vertexbuffer.c | 9 ++-- dlls/wined3d/wined3d_private.h | 1 include/wine/wined3d_types.h | 1 5 files changed, 46 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=85aa8ab85508111444d…

1 0

Ivan Gyurdiev : wined3d: Only link and use GLSL program if at least one GLSL shader is available.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: fc2611d4a8deb200f1a986a60dca2af167803923 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc2611d4a8deb200f1a986a… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Fri Jul 7 00:17:58 2006 -0600 wined3d: Only link and use GLSL program if at least one GLSL shader is available. --- dlls/wined3d/device.c | 6 ------ dlls/wined3d/drawprim.c | 15 ++++++++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 714bb1d..7176954 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -282,12 +282,6 @@ void set_glsl_shader_program(IWineD3DDev struct list *ptr = NULL; GLhandleARB programId = 0; - if (NULL == vshader && NULL == pshader) { - /* No pixel or vertex shader specified */ - This->stateBlock->shaderPrgId = 0; - return; - } - ptr = list_head( &This->glsl_shader_progs ); while (ptr) { /* At least one program exists - see if it matches our ps/vs combination */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 075fe9b..15d0d7d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1926,13 +1926,18 @@ #undef BUFFER_OR_DATA useDrawStridedSlow = TRUE; } - /* Bind the correct GLSL shader program based on the currently set vertex & pixel shaders. */ - if (wined3d_settings.vs_selected_mode == SHADER_GLSL || + /* If GLSL is used for either pixel or vertex shaders, make a GLSL program + * Otherwise set 0, which restores fixed function */ + if ((wined3d_settings.vs_selected_mode == SHADER_GLSL && useVertexShaderFunction) || + (wined3d_settings.ps_selected_mode == SHADER_GLSL && usePixelShaderFunction)) + set_glsl_shader_program(iface); + else + This->stateBlock->shaderPrgId = 0; + + /* If GLSL is used now, or might have been used before, (re)set the program */ + if (wined3d_settings.vs_selected_mode == SHADER_GLSL || wined3d_settings.ps_selected_mode == SHADER_GLSL) { - set_glsl_shader_program(iface); - /* Start using this program ID (if it's 0, there is no shader program to use, so - * glUseProgramObjectARB(0) will disable the use of any shaders) */ if (This->stateBlock->shaderPrgId) TRACE_(d3d_shader)("Using GLSL program %u\n", This->stateBlock->shaderPrgId); GL_EXTCALL(glUseProgramObjectARB(This->stateBlock->shaderPrgId));

1 0

Mikołaj Zalewski : shell32: Show a confirmation before deleting files with syscalls.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: ea0a102d555be53f9650104bddb8085299918345 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea0a102d555be53f9650104… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 6 20:46:21 2006 +0200 shell32: Show a confirmation before deleting files with syscalls. --- dlls/shell32/shell32_En.rc | 1 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shfldr_unixfs.c | 4 ++++ dlls/shell32/shlfileop.c | 5 +++++ dlls/shell32/shresdef.h | 1 + 5 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 689858d..2cf8047 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -164,6 +164,7 @@ STRINGTABLE DISCARDABLE IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" + IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" IDS_OVERWRITEFILE_TEXT "OverWrite File %1?" IDS_OVERWRITEFILE_CAPTION "Confirm File OverWrite" diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index cc021d1..1ba0126 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -147,6 +147,7 @@ #define ASK_DELETE_FOLDER 2 #define ASK_DELETE_MULTIPLE_ITEM 3 #define ASK_CREATE_FOLDER 4 #define ASK_OVERWRITE_FILE 5 +#define ASK_DELETE_SELECTED 6 BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pwszDir, BOOL bShowUI); BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 2fd7de5..7d458b7 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1825,8 +1825,12 @@ static HRESULT UNIXFS_delete_with_shfile static HRESULT UNIXFS_delete_with_syscalls(UnixFolder *This, UINT cidl, LPCITEMIDLIST *apidl) { char szAbsolute[FILENAME_MAX], *pszRelative; + static const WCHAR empty[] = {0}; int i; + if (!SHELL_ConfirmDialogW(GetActiveWindow(), ASK_DELETE_SELECTED, empty)) + return S_OK; + lstrcpyA(szAbsolute, This->m_pszPath); pszRelative = szAbsolute + lstrlenA(szAbsolute); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 977e301..e1d7ba9 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -91,6 +91,11 @@ static BOOL SHELL_ConfirmIDs(int nKindOf ids->caption_resource_id = IDS_DELETEITEM_CAPTION; ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; return TRUE; + case ASK_DELETE_SELECTED: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; + ids->caption_resource_id = IDS_DELETEITEM_CAPTION; + ids->text_resource_id = IDS_DELETESELECTED_TEXT; + return TRUE; case ASK_OVERWRITE_FILE: ids->hIconInstance = NULL; ids->icon_resource_id = IDI_WARNING; diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index aa95d33..7acd382 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -52,6 +52,7 @@ #define IDS_DELETEITEM_TEXT 34 #define IDS_DELETEMULTIPLE_TEXT 35 #define IDS_OVERWRITEFILE_CAPTION 36 #define IDS_OVERWRITEFILE_TEXT 37 +#define IDS_DELETESELECTED_TEXT 38 #define IDS_RESTART_TITLE 40 #define IDS_RESTART_PROMPT 41

1 0

Mikołaj Zalewski : shell32: If possible use SHFileOperationW to delete in unixfs.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 4485bf0b617b674ff0f579dbed7b80dd45b9f75f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4485bf0b617b674ff0f579d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 6 20:38:37 2006 +0200 shell32: If possible use SHFileOperationW to delete in unixfs. This gives confirmation dialogs, recursive directory removal etc. --- dlls/shell32/shfldr_unixfs.c | 104 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 93 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index b74b458..2fd7de5 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1763,6 +1763,87 @@ static HRESULT WINAPI UnixFolder_ISFHelp } } +/* + * Delete specified files by converting the path to DOS paths and calling + * SHFileOperationW. If an error occurs it returns an error code. If the paths can't + * be converted, S_FALSE is returned. In such situation DeleteItems will try to delete + * the files using syscalls + */ +static HRESULT UNIXFS_delete_with_shfileop(UnixFolder *This, UINT cidl, LPCITEMIDLIST *apidl) +{ + char szAbsolute[FILENAME_MAX], *pszRelative; + LPWSTR wszPathsList, wszListPos; + SHFILEOPSTRUCTW op; + HRESULT ret; + int i; + + lstrcpyA(szAbsolute, This->m_pszPath); + pszRelative = szAbsolute + lstrlenA(szAbsolute); + + wszListPos = wszPathsList = HeapAlloc(GetProcessHeap(), 0, cidl*MAX_PATH*sizeof(WCHAR)+1); + if (wszPathsList == NULL) + return E_OUTOFMEMORY; + for (i=0; i<cidl; i++) { + LPWSTR wszDosPath; + + if (!_ILIsFolder(apidl[i]) && !_ILIsValue(apidl[i])) + continue; + if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelative)) + { + HeapFree(GetProcessHeap(), 0, wszPathsList); + return E_INVALIDARG; + } + wszDosPath = wine_get_dos_file_name(szAbsolute); + if (wszDosPath == NULL || lstrlenW(wszDosPath) >= MAX_PATH) + { + HeapFree(GetProcessHeap(), 0, wszPathsList); + HeapFree(GetProcessHeap(), 0, wszDosPath); + return S_FALSE; + } + lstrcpyW(wszListPos, wszDosPath); + wszListPos += lstrlenW(wszListPos)+1; + HeapFree(GetProcessHeap(), 0, wszDosPath); + } + *wszListPos = 0; + + ZeroMemory(&op, sizeof(op)); + op.hwnd = GetActiveWindow(); + op.wFunc = FO_DELETE; + op.pFrom = wszPathsList; + if (!SHFileOperationW(&op)) + { + WARN("SHFileOperationW failed\n"); + ret = E_FAIL; + } + else + ret = S_OK; + + HeapFree(GetProcessHeap(), 0, wszPathsList); + return ret; +} + +static HRESULT UNIXFS_delete_with_syscalls(UnixFolder *This, UINT cidl, LPCITEMIDLIST *apidl) +{ + char szAbsolute[FILENAME_MAX], *pszRelative; + int i; + + lstrcpyA(szAbsolute, This->m_pszPath); + pszRelative = szAbsolute + lstrlenA(szAbsolute); + + for (i=0; i<cidl; i++) { + if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelative)) + return E_INVALIDARG; + if (_ILIsFolder(apidl[i])) { + if (rmdir(szAbsolute)) + return E_FAIL; + } else if (_ILIsValue(apidl[i])) { + if (unlink(szAbsolute)) + return E_FAIL; + } + } + return S_OK; +} + static HRESULT WINAPI UnixFolder_ISFHelper_DeleteItems(ISFHelper* iface, UINT cidl, LPCITEMIDLIST* apidl) { @@ -1771,26 +1852,27 @@ static HRESULT WINAPI UnixFolder_ISFHelp LPITEMIDLIST pidlAbsolute; HRESULT hr = S_OK; UINT i; + struct stat st; TRACE("(iface=%p, cidl=%d, apidl=%p)\n", iface, cidl, apidl); + hr = UNIXFS_delete_with_shfileop(This, cidl, apidl); + if (hr == S_FALSE) + hr = UNIXFS_delete_with_syscalls(This, cidl, apidl); + lstrcpyA(szAbsolute, This->m_pszPath); pszRelative = szAbsolute + lstrlenA(szAbsolute); - for (i=0; i<cidl && SUCCEEDED(hr); i++) { + /* we need to manually send the notifies if the files doesn't exist */ + for (i=0; i<cidl; i++) { if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelative)) - return E_INVALIDARG; + continue; pidlAbsolute = ILCombine(This->m_pidlLocation, apidl[i]); - if (_ILIsFolder(apidl[i])) { - if (rmdir(szAbsolute)) { - hr = E_FAIL; - } else { + if (stat(szAbsolute, &st)) + { + if (_ILIsFolder(apidl[i])) { SHChangeNotify(SHCNE_RMDIR, SHCNF_IDLIST, pidlAbsolute, NULL); - } - } else if (_ILIsValue(apidl[i])) { - if (unlink(szAbsolute)) { - hr = E_FAIL; - } else { + } else if (_ILIsValue(apidl[i])) { SHChangeNotify(SHCNE_DELETE, SHCNF_IDLIST, pidlAbsolute, NULL); } }

1 0

Christoph Frick : dinput: map_axis must be able to work with LONG' s value range.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 2460b4576b06347355f8ac23a75c92f30005a015 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2460b4576b06347355f8ac2… Author: Christoph Frick <frick(a)sc-networks.de> Date: Fri Jul 7 10:01:42 2006 +0200 dinput: map_axis must be able to work with LONG's value range. --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 727fac1..c88ac78 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -664,7 +664,7 @@ map_axis(JoystickImpl* This, int axis, i if (xmin == xmax) return val; /* map the value from the hmin-hmax range into the wmin-wmax range */ - ret = ((val-hmin) * (wmax-wmin)) / (hmax-hmin) + wmin; + ret = MulDiv( val - hmin, wmax - wmin, hmax - hmin ) + wmin; TRACE("xmin=%d xmax=%d hmin=%d hmax=%d wmin=%d wmax=%d val=%d ret=%d\n", xmin, xmax, hmin, hmax, wmin, wmax, val, ret);

1 0

Christoph Frick : dinput: Remove redundant struct members.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 97fed19afc1aef22c8fe4c881f53937b7c31cbc4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97fed19afc1aef22c8fe4c8… Author: Christoph Frick <frick(a)sc-networks.de> Date: Fri Jul 7 10:00:01 2006 +0200 dinput: Remove redundant struct members. --- dlls/dinput/joystick_linuxinput.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 9304171..727fac1 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -145,8 +145,6 @@ struct JoystickImpl DIJOYSTATE2 js; /* Force feedback variables */ - BOOL has_ff; - int num_effects; EffectListItem* top_effect; int ff_state; }; @@ -1230,7 +1228,7 @@ static HRESULT WINAPI JoystickAImpl_GetC } } - if (This->has_ff) + if (This->joydev->has_ff) lpDIDevCaps->dwFlags |= DIDC_FORCEFEEDBACK; lpDIDevCaps->dwAxes = axes; @@ -1332,7 +1330,7 @@ static HRESULT WINAPI JoystickAImpl_Enum ddoi.dwOfs = This->df->rgodf[user_object].dwOfs; /* Linux event force feedback supports only (and always) x and y axes */ if (i == ABS_X || i == ABS_Y) { - if (This->has_ff) + if (This->joydev->has_ff) ddoi.dwFlags |= DIDOI_FFACTUATOR; } sprintf(ddoi.tszName, "%d-Axis", i);

1 0

Christoph Frick : dinput: Implement the GetProperty call for getting the range of an axis.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Module: wine Branch: refs/heads/master Commit: 3083b0a6c7aed6d2ef2140d625f66fa1b75e6bef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3083b0a6c7aed6d2ef2140d… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Jul 6 13:18:13 2006 +0200 dinput: Implement the GetProperty call for getting the range of an axis. --- dlls/dinput/joystick_linuxinput.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index f365010..9304171 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1443,13 +1443,14 @@ static HRESULT WINAPI JoystickAImpl_GetP } case (DWORD) DIPROP_RANGE: { - /* LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; */ - if ((pdiph->dwHow == DIPH_BYID) && - (pdiph->dwObj & DIDFT_ABSAXIS)) { - /* The app is querying the current range of the axis : return the lMin and lMax values */ - FIXME("unimplemented axis range query.\n"); + LPDIPROPRANGE pr = (LPDIPROPRANGE) pdiph; + int obj = find_property_offset(This, pdiph); + if (obj >= 0) { + pr->lMin = This->joydev->havemin[obj]; + pr->lMax = This->joydev->havemax[obj]; + TRACE("range(%ld, %ld) obj=%d\n", pr->lMin, pr->lMax, obj); + return DI_OK; } - break; }

1 0