May 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Implement MsiGetMode(MSIRUNMODE_ROLLBACKENABLED).
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Hans Leidekker : msi: Schedule rollback for standard actions.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 0f5cb14a67b9747668ed0e148ca3779f9a8e1b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5cb14a67b9747668ed0e148… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:33:45 2011 +0200 msi: Schedule rollback for standard actions. --- dlls/msi/action.c | 162 +++++++++++++++++++++++++++------------------------- dlls/msi/custom.c | 10 ++-- dlls/msi/msipriv.h | 4 +- 3 files changed, 91 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f5cb14a67b9747668ed0…

1 0

Hans Leidekker : msi: Execute the rollback script if the installation failed.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 1ab830188a5a823030db105e803e6a6d764bcd88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab830188a5a823030db105e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 20 12:34:00 2011 +0200 msi: Execute the rollback script if the installation failed. --- dlls/msi/action.c | 50 ++++++++++++++++++++++++++++++++++++-------------- dlls/msi/custom.c | 6 ------ 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 45b3d79..f0c05d6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2316,28 +2316,40 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) return ERROR_SUCCESS; } -static UINT execute_script(MSIPACKAGE *package, UINT script ) +static UINT execute_script_action( MSIPACKAGE *package, UINT script, UINT index ) { - UINT i; - UINT rc = ERROR_SUCCESS; + const WCHAR *action = package->script->Actions[script][index]; + ui_actionstart( package, action ); + TRACE("executing %s\n", debugstr_w(action)); + return ACTION_PerformAction( package, action, script ); +} + +static UINT execute_script( MSIPACKAGE *package, UINT script ) +{ + UINT i, rc = ERROR_SUCCESS; - TRACE("Executing Script %i\n",script); + TRACE("executing script %u\n", script); if (!package->script) { ERR("no script!\n"); return ERROR_FUNCTION_FAILED; } - - for (i = 0; i < package->script->ActionCount[script]; i++) + if (script == ROLLBACK_SCRIPT) { - LPWSTR action; - action = package->script->Actions[script][i]; - ui_actionstart(package, action); - TRACE("Executing Action (%s)\n",debugstr_w(action)); - rc = ACTION_PerformAction(package, action, script); - if (rc != ERROR_SUCCESS) - break; + for (i = package->script->ActionCount[script]; i > 0; i--) + { + rc = execute_script_action( package, script, i - 1 ); + if (rc != ERROR_SUCCESS) break; + } + } + else + { + for (i = 0; i < package->script->ActionCount[script]; i++) + { + rc = execute_script_action( package, script, i ); + if (rc != ERROR_SUCCESS) break; + } } msi_free_action_script(package, script); return rc; @@ -8153,7 +8165,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, LPCWSTR szCommandLine ) { UINT rc; - BOOL ui_exists; + BOOL ui_exists, needs_rollback = FALSE; 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}; @@ -8248,11 +8260,21 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, else if (rc == ERROR_INSTALL_SUSPEND) ACTION_PerformActionSequence(package, -4); else /* failed */ + { ACTION_PerformActionSequence(package, -3); + needs_rollback = TRUE; + } /* finish up running custom actions */ ACTION_FinishCustomActions(package); + if (needs_rollback && !msi_get_property_int( package->db, szRollbackDisabled, 0 )) + { + WARN("installation failed, running rollback script\n"); + msi_set_property( package->db, szRollbackDisabled, NULL ); + execute_script( package, ROLLBACK_SCRIPT ); + } + if (rc == ERROR_SUCCESS && package->need_reboot) return ERROR_SUCCESS_REBOOT_REQUIRED; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2eb7bad..1a23175 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -328,12 +328,6 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL msi_free(actiondata); } - if (type & msidbCustomActionTypeRollback) - { - FIXME("Rollbacks not supported yet\n"); - rc = ERROR_SUCCESS; - goto end; - } } else if (!check_execution_scheduling_options(package,action,type)) {

1 0

Hans Leidekker : msi: Implement the DisableRollback standard action.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Hans Leidekker : msi: Factor out common code from MsiEnumComponentCostsW.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Lucas Fialho Zawacki : include: Added DI*_ANY action constants.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Dylan Smith : d3dx9: Implement D3DXFrameDestroy.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: c3201a46780ff70151e460a1985994576e8890d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3201a46780ff70151e460a19… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 19 04:02:29 2011 -0400 d3dx9: Implement D3DXFrameDestroy. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 437e9b2..80f34e2 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -134,7 +134,7 @@ @ stub D3DXFloat32To16Array(ptr ptr long) @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) -@ stub D3DXFrameDestroy(ptr ptr) +@ stdcall D3DXFrameDestroy(ptr ptr) @ stub D3DXFrameFind(ptr ptr) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b5504d5..c5954b3 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1808,6 +1808,49 @@ HRESULT WINAPI D3DXCreateMeshFVF(DWORD numfaces, DWORD numvertices, DWORD option return D3DXCreateMesh(numfaces, numvertices, options, declaration, device, mesh); } + +HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc_hier) +{ + HRESULT hr; + BOOL last = FALSE; + + TRACE("(%p, %p)\n", frame, alloc_hier); + + if (!frame || !alloc_hier) + return D3DERR_INVALIDCALL; + + while (!last) { + D3DXMESHCONTAINER *container; + D3DXFRAME *current_frame; + + if (frame->pFrameSibling) { + current_frame = frame->pFrameSibling; + frame->pFrameSibling = current_frame->pFrameSibling; + current_frame->pFrameSibling = NULL; + } else if (frame) { + current_frame = frame; + last = TRUE; + } + + if (current_frame->pFrameFirstChild) { + hr = D3DXFrameDestroy(current_frame->pFrameFirstChild, alloc_hier); + if (FAILED(hr)) return hr; + current_frame->pFrameFirstChild = NULL; + } + + container = current_frame->pMeshContainer; + while (container) { + D3DXMESHCONTAINER *next_container = container->pNextMeshContainer; + hr = alloc_hier->lpVtbl->DestroyMeshContainer(alloc_hier, container); + if (FAILED(hr)) return hr; + container = next_container; + } + hr = alloc_hier->lpVtbl->DestroyFrame(alloc_hier, current_frame); + if (FAILED(hr)) return hr; + } + return D3D_OK; +} + HRESULT WINAPI D3DXCreateBox(LPDIRECT3DDEVICE9 device, FLOAT width, FLOAT height, FLOAT depth, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) {

1 0

Alexandre Julliard : services: Load some timeout parameters from the registry.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: c9dc9a10631eecd731009e7d6d549cb4491d055e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9dc9a10631eecd731009e7d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 12:33:58 2011 +0200 services: Load some timeout parameters from the registry. --- programs/services/services.c | 35 ++++++++++++++++++++++++++++++++++- programs/services/services.h | 3 +++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index b3ed1a3..2b1b8c5 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -38,6 +38,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(service); HANDLE g_hStartedEvent; struct scmdatabase *active_database; +DWORD service_pipe_timeout = 10000; +DWORD service_kill_timeout = 20000; + static const int is_win64 = (sizeof(void *) > sizeof(int)); static const WCHAR SZ_LOCAL_SYSTEM[] = {'L','o','c','a','l','S','y','s','t','e','m',0}; @@ -650,7 +653,7 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL DWORD dwCurrentStatus; HANDLE handles[2] = { service_entry->status_changed_event, process_handle }; DWORD ret; - ret = WaitForMultipleObjects(sizeof(handles)/sizeof(handles[0]), handles, FALSE, 20000); + ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); if (ret != WAIT_OBJECT_0) return ERROR_SERVICE_REQUEST_TIMEOUT; service_lock_shared(service_entry); @@ -775,12 +778,42 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * return err; } +static void load_registry_parameters(void) +{ + static const WCHAR controlW[] = + { 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l',0 }; + static const WCHAR pipetimeoutW[] = + {'S','e','r','v','i','c','e','s','P','i','p','e','T','i','m','e','o','u','t',0}; + static const WCHAR killtimeoutW[] = + {'W','a','i','t','T','o','K','i','l','l','S','e','r','v','i','c','e','T','i','m','e','o','u','t',0}; + HKEY key; + WCHAR buffer[64]; + DWORD type, count, val; + + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, controlW, &key )) return; + + count = sizeof(buffer); + if (!RegQueryValueExW( key, pipetimeoutW, NULL, &type, (BYTE *)buffer, &count ) && + type == REG_SZ && (val = atoiW( buffer ))) + service_pipe_timeout = val; + + count = sizeof(buffer); + if (!RegQueryValueExW( key, killtimeoutW, NULL, &type, (BYTE *)buffer, &count ) && + type == REG_SZ && (val = atoiW( buffer ))) + service_kill_timeout = val; + + RegCloseKey( key ); +} int main(int argc, char *argv[]) { static const WCHAR svcctl_started_event[] = SVCCTL_STARTED_EVENT; DWORD err; + g_hStartedEvent = CreateEventW(NULL, TRUE, FALSE, svcctl_started_event); + load_registry_parameters(); err = scmdatabase_create(&active_database); if (err != ERROR_SUCCESS) return err; diff --git a/programs/services/services.h b/programs/services/services.h index ea917f4..63154c8 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -80,6 +80,9 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, extern HANDLE g_hStartedEvent; +extern DWORD service_pipe_timeout; +extern DWORD service_kill_timeout; + DWORD RPC_Init(void); DWORD RPC_MainLoop(void);

1 0

Dylan Smith : d3dx9/tests: Correct ok messages to be consistent with their test.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: f272fb29217209210720995bdcdaf971a50e0ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f272fb29217209210720995bd… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 19 04:04:59 2011 -0400 d3dx9/tests: Correct ok messages to be consistent with their test. --- dlls/d3dx9_36/tests/mesh.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c8853cd..cedef32 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -143,8 +143,8 @@ static void compare_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mes ok(vertex_buffer_description.Type == D3DRTYPE_VERTEXBUFFER, "Test %s, result %x, expected %x (D3DRTYPE_VERTEXBUFFER)\n", name, vertex_buffer_description.Type, D3DRTYPE_VERTEXBUFFER); ok(vertex_buffer_description.Usage == 0, "Test %s, result %x, expected %x\n", name, vertex_buffer_description.Usage, 0); - ok(vertex_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_DEFAULT)\n", - name, vertex_buffer_description.Pool, D3DPOOL_DEFAULT); + ok(vertex_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_MANAGED)\n", + name, vertex_buffer_description.Pool, D3DPOOL_MANAGED); ok(vertex_buffer_description.FVF == mesh->fvf, "Test %s, result %x, expected %x\n", name, vertex_buffer_description.FVF, mesh->fvf); if (mesh->fvf == 0) @@ -212,8 +212,8 @@ static void compare_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mes ok(index_buffer_description.Type == D3DRTYPE_INDEXBUFFER, "Test %s, result %x, expected %x (D3DRTYPE_INDEXBUFFER)\n", name, index_buffer_description.Type, D3DRTYPE_INDEXBUFFER); todo_wine ok(index_buffer_description.Usage == 0, "Test %s, result %x, expected %x\n", name, index_buffer_description.Usage, 0); - ok(index_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_DEFAULT)\n", - name, index_buffer_description.Pool, D3DPOOL_DEFAULT); + ok(index_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_MANAGED)\n", + name, index_buffer_description.Pool, D3DPOOL_MANAGED); expected = number_of_faces * sizeof(WORD) * 3; ok(index_buffer_description.Size == expected, "Test %s, result %x, expected %x\n", name, index_buffer_description.Size, expected); @@ -2596,8 +2596,8 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str ok(vertex_buffer_description.Type == D3DRTYPE_VERTEXBUFFER, "Test %s, result %x, expected %x (D3DRTYPE_VERTEXBUFFER)\n", name, vertex_buffer_description.Type, D3DRTYPE_VERTEXBUFFER); ok(vertex_buffer_description.Usage == 0, "Test %s, result %x, expected %x\n", name, vertex_buffer_description.Usage, 0); - ok(vertex_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_DEFAULT)\n", - name, vertex_buffer_description.Pool, D3DPOOL_DEFAULT); + ok(vertex_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_MANAGED)\n", + name, vertex_buffer_description.Pool, D3DPOOL_MANAGED); ok(vertex_buffer_description.FVF == mesh->fvf, "Test %s, result %x, expected %x\n", name, vertex_buffer_description.FVF, mesh->fvf); if (mesh->fvf == 0) @@ -2634,8 +2634,8 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str ok(index_buffer_description.Type == D3DRTYPE_INDEXBUFFER, "Test %s, result %x, expected %x (D3DRTYPE_INDEXBUFFER)\n", name, index_buffer_description.Type, D3DRTYPE_INDEXBUFFER); todo_wine ok(index_buffer_description.Usage == 0, "Test %s, result %x, expected %x\n", name, index_buffer_description.Usage, 0); - ok(index_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_DEFAULT)\n", - name, index_buffer_description.Pool, D3DPOOL_DEFAULT); + ok(index_buffer_description.Pool == D3DPOOL_MANAGED, "Test %s, result %x, expected %x (D3DPOOL_MANAGED)\n", + name, index_buffer_description.Pool, D3DPOOL_MANAGED); expected = number_of_faces * sizeof(WORD) * 3; ok(index_buffer_description.Size == expected, "Test %s, result %x, expected %x\n", name, index_buffer_description.Size, expected);

1 0

Lucas Fialho Zawacki : include: Added some dinput8 DIPROP definitions.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: ea0181c94fc77c846ef02daeef0a36a32d89f541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0181c94fc77c846ef02daee… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu May 19 22:41:23 2011 -0300 include: Added some dinput8 DIPROP definitions. --- include/dinput.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index c52a1b7..afcb3c3 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -766,6 +766,14 @@ typedef const DIPROPSTRING *LPCDIPROPSTRING; #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_VIDPID MAKEDIPROP(24) +#define DIPROP_KEYNAME MAKEDIPROP(20) +#define DIPROP_CPOINTS MAKEDIPROP(21) +#define DIPROP_APPDATA MAKEDIPROP(22) +#define DIPROP_SCANCODE MAKEDIPROP(23) +#define DIPROP_VIDPID MAKEDIPROP(24) +#define DIPROP_USERNAME MAKEDIPROP(25) +#define DIPROP_TYPENAME MAKEDIPROP(26) + typedef struct DIDEVCAPS_DX3 { DWORD dwSize; DWORD dwFlags;

1 0