winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
945 discussions
Start a n
N
ew thread
Hans Leidekker : msi: Implement MsiGetMode(MSIRUNMODE_ROLLBACKENABLED).
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 49f263558b2e1b454486a9d0b135e0babc56cafb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=49f263558b2e1b454486a9d0b…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:33:30 2011 +0200 msi: Implement MsiGetMode(MSIRUNMODE_ROLLBACKENABLED). --- dlls/msi/install.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index e90c3b1..0e57d6b 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -762,6 +762,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = msi_get_property_int( package->db, szInstalled, 0 ) != 0; break; + case MSIRUNMODE_ROLLBACKENABLED: + r = msi_get_property_int( package->db, szRollbackDisabled, 0 ) == 0; + break; + case MSIRUNMODE_REBOOTATEND: r = package->need_reboot; break;
1
0
0
0
Hans Leidekker : msi: Implement the DisableRollback standard action.
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 9c9e0981b44791728ee205cdc4e2fd548c600850 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9c9e0981b44791728ee205cdc…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:33:16 2011 +0200 msi: Implement the DisableRollback standard action. --- dlls/msi/action.c | 12 ++++++++++-- dlls/msi/msipriv.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f41c921..2c38fb7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7719,7 +7719,9 @@ static UINT ACTION_AllocateRegistrySpace( MSIPACKAGE *package ) static UINT ACTION_DisableRollback( MSIPACKAGE *package ) { - FIXME("%p\n", package); + TRACE("%p\n", package); + + msi_set_property( package->db, szRollbackDisabled, szOne ); return ERROR_SUCCESS; } @@ -8146,7 +8148,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, { UINT rc; BOOL ui_exists; - + static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; @@ -8210,6 +8212,12 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_adjust_privilege_properties( package ); msi_set_context( package ); + if (msi_get_property_int( package->db, szDisableRollback, 0 )) + { + TRACE("disabling rollback\n"); + msi_set_property( package->db, szRollbackDisabled, szOne ); + } + if (needs_ui_sequence( package)) { package->script->InWhatSequence |= SEQUENCE_UI; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2cc7daf..733b316 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1143,6 +1143,7 @@ static const WCHAR szStringPool[] = {'_','S','t','r','i','n','g','P','o','o','l' static const WCHAR szInstallLevel[] = {'I','N','S','T','A','L','L','L','E','V','E','L',0}; static const WCHAR szCostInitialize[] = {'C','o','s','t','I','n','i','t','i','a','l','i','z','e',0}; static const WCHAR szAppDataFolder[] = {'A','p','p','D','a','t','a','F','o','l','d','e','r',0}; +static const WCHAR szRollbackDisabled[] = {'R','o','l','l','b','a','c','k','D','i','s','a','b','l','e','d',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
1
0
0
0
Hans Leidekker : msi: Avoid a double free.
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: b817fb1aaa3ede132dff5932ba97e430558299cc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b817fb1aaa3ede132dff5932b…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:32:57 2011 +0200 msi: Avoid a double free. --- dlls/msi/media.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 608e84c..9de2566 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -238,10 +238,10 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) { hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); - msi_free( encoded ); if (FAILED(hr)) { WARN("failed to open stream 0x%08x\n", hr); + msi_free( encoded ); return 0; } }
1
0
0
0
Hans Leidekker : msi: Recursively create the destination directory in the MoveFiles action.
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 7545fc1014363b40f6f9fa3b9e98f4c27b6b46a7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7545fc1014363b40f6f9fa3b9…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:32:41 2011 +0200 msi: Recursively create the destination directory in the MoveFiles action. --- dlls/msi/files.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 06854be..97dbfa0 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -865,10 +865,9 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) if (GetFileAttributesW(destdir) == INVALID_FILE_ATTRIBUTES) { - ret = CreateDirectoryW(destdir, NULL); - if (!ret) + if (!(ret = msi_create_full_path(destdir))) { - WARN("CreateDirectory failed: %d\n", GetLastError()); + WARN("failed to create directory %u\n", GetLastError()); goto done; } }
1
0
0
0
Hans Leidekker : msi: Factor out common code from MsiEnumComponentCostsW.
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 4a1c243e6a0827ac1e2c0a36678fd4935a7915e6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4a1c243e6a0827ac1e2c0a366…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:32:23 2011 +0200 msi: Factor out common code from MsiEnumComponentCostsW. --- dlls/msi/msi.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 0f11024..5075756 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1825,6 +1825,14 @@ UINT WINAPI MsiEnumComponentCostsA( MSIHANDLE handle, LPCSTR component, DWORD in return r; } +static UINT set_drive( WCHAR *buffer, WCHAR letter ) +{ + buffer[0] = letter; + buffer[1] = ':'; + buffer[2] = 0; + return 2; +} + UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD index, INSTALLSTATE state, LPWSTR drive, DWORD *buflen, int *cost, int *temp ) @@ -1896,29 +1904,20 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i if (!comp->Enabled || !comp->KeyPath) { *cost = 0; - drive[0] = path[0]; - drive[1] = ':'; - drive[2] = 0; - *buflen = 2; + *buflen = set_drive( drive, path[0] ); r = ERROR_SUCCESS; } else if ((file = msi_get_loaded_file( package, comp->KeyPath ))) { *cost = max( 8, comp->Cost / 512 ); - drive[0] = file->TargetPath[0]; - drive[1] = ':'; - drive[2] = 0; - *buflen = 2; + *buflen = set_drive( drive, file->TargetPath[0] ); r = ERROR_SUCCESS; } } else if (IStorage_Stat( package->db->storage, &stat, STATFLAG_NONAME ) == S_OK) { *temp = max( 8, stat.cbSize.QuadPart / 512 ); - drive[0] = path[0]; - drive[1] = ':'; - drive[2] = 0; - *buflen = 2; + *buflen = set_drive( drive, path[0] ); r = ERROR_SUCCESS; } msiobj_release( &package->hdr );
1
0
0
0
Rico Schüller : d3dx9: Parse effect samplers.
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 0858dee303ec8e249367a82a3018a0505a6b523e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0858dee303ec8e249367a82a3…
Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 20 11:07:10 2011 +0200 d3dx9: Parse effect samplers. --- dlls/d3dx9_36/effect.c | 110 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 87 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5b32a88..7608717 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -335,6 +335,14 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); break; + case D3DXPT_SAMPLER: + case D3DXPT_SAMPLER1D: + case D3DXPT_SAMPLER2D: + case D3DXPT_SAMPLER3D: + case D3DXPT_SAMPLERCUBE: + /* Todo: free sampler */ + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break; @@ -1210,27 +1218,53 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH if (!param) param = get_parameter_by_name(This, NULL, parameter); - if (data && param && param->data && param->bytes <= bytes) + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER + || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D + || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + { + TRACE("Sampler: returning E_FAIL\n"); + return E_FAIL; + } + + if (data && param && param->bytes <= bytes) { - if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER - || param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D - || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D - || param->type == D3DXPT_TEXTURECUBE) + TRACE("Type %s\n", debug_d3dxparameter_type(param->type)); + + switch (param->type) { - UINT i; + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + case D3DXPT_STRING: + break; - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + case D3DXPT_VERTEXSHADER: + case D3DXPT_PIXELSHADER: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: { - IUnknown *unk = ((IUnknown **)param->data)[i]; - if (unk) IUnknown_AddRef(unk); - ((IUnknown **)data)[i] = unk; + UINT i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)param->data)[i]; + if (unk) IUnknown_AddRef(unk); + } + break; } + + default: + FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + break; } - else - { - TRACE("Copy %u bytes\n", param->bytes); - memcpy(data, param->data, param->bytes); - } + + TRACE("Copy %u bytes\n", param->bytes); + memcpy(data, param->data, param->bytes); return D3D_OK; } @@ -3336,7 +3370,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons { struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); - hr = d3dx9_parse_value(member, (char *)value + old_size, ptr); + hr = d3dx9_parse_value(member, value ? (char *)value + old_size : NULL, ptr); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3393,6 +3427,25 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons param->data = value; break; + case D3DXPT_SAMPLER: + case D3DXPT_SAMPLER1D: + case D3DXPT_SAMPLER2D: + case D3DXPT_SAMPLER3D: + case D3DXPT_SAMPLERCUBE: + { + UINT state_count; + + read_dword(ptr, &state_count); + TRACE("Count: %u\n", state_count); + + for (i = 0; i < state_count; ++i) + { + /* Todo: parse states */ + skip_dword_unknown(ptr, 4); + } + break; + } + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break; @@ -3415,15 +3468,18 @@ static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char * TRACE("param size: %u\n", size); - value = HeapAlloc(GetProcessHeap(), 0, size); - if (!value) + if (size) { - ERR("Failed to allocate data memory.\n"); - return E_OUTOFMEMORY; - } + value = HeapAlloc(GetProcessHeap(), 0, size); + if (!value) + { + ERR("Failed to allocate data memory.\n"); + return E_OUTOFMEMORY; + } - TRACE("Data: %s.\n", debugstr_an(ptr, size)); - memcpy(value, ptr, size); + TRACE("Data: %s.\n", debugstr_an(ptr, size)); + memcpy(value, ptr, size); + } hr = d3dx9_parse_value(param, value, &ptr); if (hr != D3D_OK) @@ -3614,6 +3670,14 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = sizeof(LPDIRECT3DBASETEXTURE9); break; + case D3DXPT_SAMPLER: + case D3DXPT_SAMPLER1D: + case D3DXPT_SAMPLER2D: + case D3DXPT_SAMPLER3D: + case D3DXPT_SAMPLERCUBE: + param->bytes = 0; + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break;
1
0
0
0
Dylan Smith : include: Replace a THIS, with THIS_ for a method with parameters.
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 4e3be18e1856ad947a87defa632fadda7ec0efb3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4e3be18e1856ad947a87defa6…
Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri May 20 04:26:08 2011 -0400 include: Replace a THIS, with THIS_ for a method with parameters. --- include/d3dx9mesh.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index b4fad7d..445272d 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -426,7 +426,7 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh) STDMETHOD(TrimByFaces)(THIS_ DWORD new_faces_min, DWORD new_faces_max, DWORD* face_remap, DWORD* vertex_remap) PURE; STDMETHOD(TrimByVertices)(THIS_ DWORD new_vertices_min, DWORD new_vertices_max, DWORD* face_remap, DWORD* vertex_remap) PURE; STDMETHOD(GetAdjacency)(THIS_ DWORD* adjacency) PURE; - STDMETHOD(GenerateVertexHistory)(THIS, DWORD* vertex_history) PURE; + STDMETHOD(GenerateVertexHistory)(THIS_ DWORD* vertex_history) PURE; }; #undef INTERFACE
1
0
0
0
Lucas Fialho Zawacki : include: Added DI*_ANY action constants.
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 872647ae426e86bd97f95251fd81e9eee4705eee URL:
http://source.winehq.org/git/wine.git/?a=commit;h=872647ae426e86bd97f95251f…
Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu May 19 22:43:22 2011 -0300 include: Added DI*_ANY action constants. --- include/dinput.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index f35db69..754b2c4 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -2159,6 +2159,37 @@ extern const DIDATAFORMAT c_dfDIJoystick2; }; #endif +#define DIAXIS_ANY_X_1 0xFF00C201 +#define DIAXIS_ANY_X_2 0xFF00C202 +#define DIAXIS_ANY_Y_1 0xFF014201 +#define DIAXIS_ANY_Y_2 0xFF014202 +#define DIAXIS_ANY_Z_1 0xFF01C201 +#define DIAXIS_ANY_Z_2 0xFF01C202 +#define DIAXIS_ANY_R_1 0xFF024201 +#define DIAXIS_ANY_R_2 0xFF024202 +#define DIAXIS_ANY_U_1 0xFF02C201 +#define DIAXIS_ANY_U_2 0xFF02C202 +#define DIAXIS_ANY_V_1 0xFF034201 +#define DIAXIS_ANY_V_2 0xFF034202 +#define DIAXIS_ANY_A_1 0xFF03C201 +#define DIAXIS_ANY_A_2 0xFF03C202 +#define DIAXIS_ANY_B_1 0xFF044201 +#define DIAXIS_ANY_B_2 0xFF044202 +#define DIAXIS_ANY_C_1 0xFF04C201 +#define DIAXIS_ANY_C_2 0xFF04C202 +#define DIAXIS_ANY_S_1 0xFF054201 +#define DIAXIS_ANY_S_2 0xFF054202 +#define DIAXIS_ANY_1 0xFF004201 +#define DIAXIS_ANY_2 0xFF004202 +#define DIAXIS_ANY_3 0xFF004203 +#define DIAXIS_ANY_4 0xFF004204 +#define DIPOV_ANY_1 0xFF004601 +#define DIPOV_ANY_2 0xFF004602 +#define DIPOV_ANY_3 0xFF004603 +#define DIPOV_ANY_4 0xFF004604 +#define DIBUTTON_ANY(instance) (0xFF004400 | (instance)) + + /***************************************************************************** * IDirectInputA interface */
1
0
0
0
Lucas Fialho Zawacki : include: Added dinput8 DIMOUSE_* definitions.
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 2e0c60fc4b3424b4591f52a14d61f7ee52874fc7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2e0c60fc4b3424b4591f52a14…
Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu May 19 22:42:45 2011 -0300 include: Added dinput8 DIMOUSE_* definitions. --- include/dinput.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index ce75541..f35db69 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -2131,6 +2131,22 @@ typedef struct DIMOUSESTATE2 { #define DIMOFS_BUTTON6 (FIELD_OFFSET(DIMOUSESTATE2, rgbButtons) + 6) #define DIMOFS_BUTTON7 (FIELD_OFFSET(DIMOUSESTATE2, rgbButtons) + 7) +/* New DirectInput8 mouse definitions */ + +#define DIMOUSE_XAXISAB (0x82000200 | DIMOFS_X) +#define DIMOUSE_YAXISAB (0x82000200 | DIMOFS_Y) +#define DIMOUSE_XAXIS (0x82000300 | DIMOFS_X) +#define DIMOUSE_YAXIS (0x82000300 | DIMOFS_Y) +#define DIMOUSE_WHEEL (0x82000300 | DIMOFS_Z) +#define DIMOUSE_BUTTON0 (0x82000400 | DIMOFS_BUTTON0) +#define DIMOUSE_BUTTON1 (0x82000400 | DIMOFS_BUTTON1) +#define DIMOUSE_BUTTON2 (0x82000400 | DIMOFS_BUTTON2) +#define DIMOUSE_BUTTON3 (0x82000400 | DIMOFS_BUTTON3) +#define DIMOUSE_BUTTON4 (0x82000400 | DIMOFS_BUTTON4) +#define DIMOUSE_BUTTON5 (0x82000400 | DIMOFS_BUTTON5) +#define DIMOUSE_BUTTON6 (0x82000400 | DIMOFS_BUTTON6) +#define DIMOUSE_BUTTON7 (0x82000400 | DIMOFS_BUTTON7) + #ifdef __cplusplus extern "C" { #endif
1
0
0
0
Lucas Fialho Zawacki : include: Added dinput8 DIKEYBOARD_* key definitions correspondent to the DIK_* already present in the header .
by Alexandre Julliard
20 May '11
20 May '11
Module: wine Branch: master Commit: 0c8bf1ec175e1582297e61626a4eb26c63c3693e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0c8bf1ec175e1582297e61626…
Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu May 19 22:42:19 2011 -0300 include: Added dinput8 DIKEYBOARD_* key definitions correspondent to the DIK_* already present in the header. --- include/dinput.h | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index afcb3c3..ce75541 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -604,6 +604,147 @@ typedef BOOL (CALLBACK *LPDIENUMCREATEDEFFECTOBJECTSCALLBACK)(LPDIRECTINPUTEFFEC #define DIK_DOWNARROW DIK_DOWN /* DownArrow on arrow keypad */ #define DIK_PGDN DIK_NEXT /* PgDn on arrow keypad */ +/* New DirectInput8 style keyboard constants */ + +#define DIKEYBOARD_ESCAPE (DIK_ESCAPE | 0x81000400) +#define DIKEYBOARD_1 (DIK_1 | 0x81000400) +#define DIKEYBOARD_2 (DIK_2 | 0x81000400) +#define DIKEYBOARD_3 (DIK_3 | 0x81000400) +#define DIKEYBOARD_4 (DIK_4 | 0x81000400) +#define DIKEYBOARD_5 (DIK_5 | 0x81000400) +#define DIKEYBOARD_6 (DIK_6 | 0x81000400) +#define DIKEYBOARD_7 (DIK_7 | 0x81000400) +#define DIKEYBOARD_8 (DIK_8 | 0x81000400) +#define DIKEYBOARD_9 (DIK_9 | 0x81000400) +#define DIKEYBOARD_0 (DIK_0 | 0x81000400) +#define DIKEYBOARD_MINUS (DIK_MINUS | 0x81000400) +#define DIKEYBOARD_EQUALS (DIK_EQUALS | 0x81000400) +#define DIKEYBOARD_BACK (DIK_BACK | 0x81000400) +#define DIKEYBOARD_TAB (DIK_TAB | 0x81000400) +#define DIKEYBOARD_Q (DIK_Q | 0x81000400) +#define DIKEYBOARD_W (DIK_W | 0x81000400) +#define DIKEYBOARD_E (DIK_E | 0x81000400) +#define DIKEYBOARD_R (DIK_R | 0x81000400) +#define DIKEYBOARD_T (DIK_T | 0x81000400) +#define DIKEYBOARD_Y (DIK_Y | 0x81000400) +#define DIKEYBOARD_U (DIK_U | 0x81000400) +#define DIKEYBOARD_I (DIK_I | 0x81000400) +#define DIKEYBOARD_O (DIK_O | 0x81000400) +#define DIKEYBOARD_P (DIK_P | 0x81000400) +#define DIKEYBOARD_LBRACKET (DIK_LBRACKET | 0x81000400) +#define DIKEYBOARD_RBRACKET (DIK_RBRACKET | 0x81000400) +#define DIKEYBOARD_RETURN (DIK_RETURN | 0x81000400) +#define DIKEYBOARD_LCONTROL (DIK_LCONTROL | 0x81000400) +#define DIKEYBOARD_A (DIK_A | 0x81000400) +#define DIKEYBOARD_S (DIK_S | 0x81000400) +#define DIKEYBOARD_D (DIK_D | 0x81000400) +#define DIKEYBOARD_F (DIK_F | 0x81000400) +#define DIKEYBOARD_G (DIK_G | 0x81000400) +#define DIKEYBOARD_H (DIK_H | 0x81000400) +#define DIKEYBOARD_J (DIK_J | 0x81000400) +#define DIKEYBOARD_K (DIK_K | 0x81000400) +#define DIKEYBOARD_L (DIK_L | 0x81000400) +#define DIKEYBOARD_SEMICOLON (DIK_SEMICOLON | 0x81000400) +#define DIKEYBOARD_APOSTROPHE (DIK_APOSTROPHE | 0x81000400) +#define DIKEYBOARD_GRAVE (DIK_GRAVE | 0x81000400) +#define DIKEYBOARD_LSHIFT (DIK_LSHIFT | 0x81000400) +#define DIKEYBOARD_BACKSLASH (DIK_BACKSLASH | 0x81000400) +#define DIKEYBOARD_Z (DIK_Z | 0x81000400) +#define DIKEYBOARD_X (DIK_X | 0x81000400) +#define DIKEYBOARD_C (DIK_C | 0x81000400) +#define DIKEYBOARD_V (DIK_V | 0x81000400) +#define DIKEYBOARD_B (DIK_B | 0x81000400) +#define DIKEYBOARD_N (DIK_N | 0x81000400) +#define DIKEYBOARD_M (DIK_M | 0x81000400) +#define DIKEYBOARD_COMMA (DIK_COMMA | 0x81000400) +#define DIKEYBOARD_PERIOD (DIK_PERIOD | 0x81000400) +#define DIKEYBOARD_SLASH (DIK_SLASH | 0x81000400) +#define DIKEYBOARD_RSHIFT (DIK_RSHIFT | 0x81000400) +#define DIKEYBOARD_MULTIPLY (DIK_MULTIPLY | 0x81000400) +#define DIKEYBOARD_LMENU (DIK_LMENU | 0x81000400) +#define DIKEYBOARD_SPACE (DIK_SPACE | 0x81000400) +#define DIKEYBOARD_CAPITAL (DIK_CAPITAL | 0x81000400) +#define DIKEYBOARD_F1 (DIK_F1 | 0x81000400) +#define DIKEYBOARD_F2 (DIK_F2 | 0x81000400) +#define DIKEYBOARD_F3 (DIK_F3 | 0x81000400) +#define DIKEYBOARD_F4 (DIK_F4 | 0x81000400) +#define DIKEYBOARD_F5 (DIK_F5 | 0x81000400) +#define DIKEYBOARD_F6 (DIK_F6 | 0x81000400) +#define DIKEYBOARD_F7 (DIK_F7 | 0x81000400) +#define DIKEYBOARD_F8 (DIK_F8 | 0x81000400) +#define DIKEYBOARD_F9 (DIK_F9 | 0x81000400) +#define DIKEYBOARD_F10 (DIK_F10 | 0x81000400) +#define DIKEYBOARD_NUMLOCK (DIK_NUMLOCK | 0x81000400) +#define DIKEYBOARD_SCROLL (DIK_SCROLL | 0x81000400) +#define DIKEYBOARD_NUMPAD7 (DIK_NUMPAD7 | 0x81000400) +#define DIKEYBOARD_NUMPAD8 (DIK_NUMPAD8 | 0x81000400) +#define DIKEYBOARD_NUMPAD9 (DIK_NUMPAD9 | 0x81000400) +#define DIKEYBOARD_SUBTRACT (DIK_SUBTRACT | 0x81000400) +#define DIKEYBOARD_NUMPAD4 (DIK_NUMPAD4 | 0x81000400) +#define DIKEYBOARD_NUMPAD5 (DIK_NUMPAD5 | 0x81000400) +#define DIKEYBOARD_NUMPAD6 (DIK_NUMPAD6 | 0x81000400) +#define DIKEYBOARD_ADD (DIK_ADD | 0x81000400) +#define DIKEYBOARD_NUMPAD1 (DIK_NUMPAD1 | 0x81000400) +#define DIKEYBOARD_NUMPAD2 (DIK_NUMPAD2 | 0x81000400) +#define DIKEYBOARD_NUMPAD3 (DIK_NUMPAD3 | 0x81000400) +#define DIKEYBOARD_NUMPAD0 (DIK_NUMPAD0 | 0x81000400) +#define DIKEYBOARD_DECIMAL (DIK_DECIMAL | 0x81000400) +#define DIKEYBOARD_F11 (DIK_F11 | 0x81000400) +#define DIKEYBOARD_F12 (DIK_F12 | 0x81000400) +#define DIKEYBOARD_F13 (DIK_F13 | 0x81000400) +#define DIKEYBOARD_F14 (DIK_F14 | 0x81000400) +#define DIKEYBOARD_F15 (DIK_F15 | 0x81000400) +#define DIKEYBOARD_KANA (DIK_KANA | 0x81000400) +#define DIKEYBOARD_CONVERT (DIK_CONVERT | 0x81000400) +#define DIKEYBOARD_NOCONVERT (DIK_NOCONVERT | 0x81000400) +#define DIKEYBOARD_YEN (DIK_YEN | 0x81000400) +#define DIKEYBOARD_NUMPADEQUALS (DIK_NUMPADEQUALS | 0x81000400) +#define DIKEYBOARD_CIRCUMFLEX (DIK_CIRCUMFLEX | 0x81000400) +#define DIKEYBOARD_AT (DIK_AT | 0x81000400) +#define DIKEYBOARD_COLON (DIK_COLON | 0x81000400) +#define DIKEYBOARD_UNDERLINE (DIK_UNDERLINE | 0x81000400) +#define DIKEYBOARD_KANJI (DIK_KANJI | 0x81000400) +#define DIKEYBOARD_STOP (DIK_STOP | 0x81000400) +#define DIKEYBOARD_AX (DIK_AX | 0x81000400) +#define DIKEYBOARD_UNLABELED (DIK_UNLABELED | 0x81000400) +#define DIKEYBOARD_NUMPADENTER (DIK_NUMPADENTER | 0x81000400) +#define DIKEYBOARD_RCONTROL (DIK_RCONTROL | 0x81000400) +#define DIKEYBOARD_NUMPADCOMMA (DIK_NUMPADCOMMA | 0x81000400) +#define DIKEYBOARD_DIVIDE (DIK_DIVIDE | 0x81000400) +#define DIKEYBOARD_SYSRQ (DIK_SYSRQ | 0x81000400) +#define DIKEYBOARD_RMENU (DIK_RMENU | 0x81000400) +#define DIKEYBOARD_PAUSE (DIK_PAUSE | 0x81000400) +#define DIKEYBOARD_HOME (DIK_HOME | 0x81000400) +#define DIKEYBOARD_UP (DIK_UP | 0x81000400) +#define DIKEYBOARD_PRIOR (DIK_PRIOR | 0x81000400) +#define DIKEYBOARD_LEFT (DIK_LEFT | 0x81000400) +#define DIKEYBOARD_RIGHT (DIK_RIGHT | 0x81000400) +#define DIKEYBOARD_END (DIK_END | 0x81000400) +#define DIKEYBOARD_DOWN (DIK_DOWN | 0x81000400) +#define DIKEYBOARD_NEXT (DIK_NEXT | 0x81000400) +#define DIKEYBOARD_INSERT (DIK_INSERT | 0x81000400) +#define DIKEYBOARD_DELETE (DIK_DELETE | 0x81000400) +#define DIKEYBOARD_LWIN (DIK_LWIN | 0x81000400) +#define DIKEYBOARD_RWIN (DIK_RWIN | 0x81000400) +#define DIKEYBOARD_APPS (DIK_APPS | 0x81000400) +#define DIKEYBOARD_POWER (DIK_POWER | 0x81000400) +#define DIKEYBOARD_SLEEP (DIK_SLEEP | 0x81000400) +#define DIKEYBOARD_BACKSPACE (DIK_BACKSPACE | 0x81000400) +#define DIKEYBOARD_NUMPADSTAR (DIK_NUMPADSTAR | 0x81000400) +#define DIKEYBOARD_LALT (DIK_LALT | 0x81000400) +#define DIKEYBOARD_CAPSLOCK (DIK_CAPSLOCK | 0x81000400) +#define DIKEYBOARD_NUMPADMINUS (DIK_NUMPADMINUS | 0x81000400) +#define DIKEYBOARD_NUMPADPLUS (DIK_NUMPADPLUS | 0x81000400) +#define DIKEYBOARD_NUMPADPERIOD (DIK_NUMPADPERIOD | 0x81000400) +#define DIKEYBOARD_NUMPADSLASH (DIK_NUMPADSLASH | 0x81000400) +#define DIKEYBOARD_RALT (DIK_RALT | 0x81000400) +#define DIKEYBOARD_UPARROW (DIK_UPARROW | 0x81000400) +#define DIKEYBOARD_PGUP (DIK_PGUP | 0x81000400) +#define DIKEYBOARD_LEFTARROW (DIK_LEFTARROW | 0x81000400) +#define DIKEYBOARD_RIGHTARROW (DIK_RIGHTARROW | 0x81000400) +#define DIKEYBOARD_DOWNARROW (DIK_DOWNARROW | 0x81000400) +#define DIKEYBOARD_PGDN (DIK_PGDN | 0x81000400) + #define DIDFT_ALL 0x00000000 #define DIDFT_RELAXIS 0x00000001 #define DIDFT_ABSAXIS 0x00000002
1
0
0
0
← Newer
1
...
32
33
34
35
36
37
38
...
95
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
Results per page:
10
25
50
100
200