wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

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

20 May '11

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

Piotr Caban : msvcrt: Fix __pctype_func implementation.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 38f476399c243309ddb5f9ec7aa598687315b945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f476399c243309ddb5f9ec7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 19 16:44:09 2011 +0200 msvcrt: Fix __pctype_func implementation. --- dlls/msvcrt/ctype.c | 6 +++--- dlls/msvcrt/msvcrt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 94815b8..5573608 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -56,14 +56,14 @@ WORD MSVCRT__ctype [257] = { * changes to affect ctypes (i.e. isleadbyte), we use a second table * and update its flags whenever the current locale changes. */ -WORD* MSVCRT__pctype = NULL; +unsigned short *MSVCRT__pctype = NULL; /********************************************************************* * __pctype_func (MSVCRT.@) */ -WORD** CDECL MSVCRT___pctype_func(void) +const unsigned short* CDECL MSVCRT___pctype_func(void) { - return &get_locale()->locinfo->pctype; + return get_locale()->locinfo->pctype; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e677022..31fe719 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -135,7 +135,7 @@ extern int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern int MSVCRT___mb_cur_max; extern WORD MSVCRT__ctype [257]; -extern WORD* MSVCRT__pctype; +extern unsigned short *MSVCRT__pctype; void msvcrt_set_errno(int);

1 0

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

20 May '11

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

Dylan Smith : d3dx9: Implement D3DXFrameDestroy.
by Alexandre Julliard 20 May '11

20 May '11

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: Add a timeout to all pipe communications with the service process.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: f51668fdf9dad4e40194f7e08e44743c1c1c1388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51668fdf9dad4e40194f7e08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 12:31:27 2011 +0200 services: Add a timeout to all pipe communications with the service process. --- programs/services/rpc.c | 16 ++++++++++++++-- programs/services/services.c | 36 ++++++++++++++++++++++++++++-------- programs/services/services.h | 1 + 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index d1dd39e..15ea7cf 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -893,16 +893,28 @@ static BOOL service_accepts_control(const struct service_entry *service, DWORD d BOOL service_send_command( struct service_entry *service, HANDLE pipe, const void *data, DWORD size, DWORD *result ) { + OVERLAPPED overlapped; DWORD count; BOOL r; - r = WriteFile(pipe, data, size, &count, NULL); + overlapped.hEvent = service->overlapped_event; + r = WriteFile(pipe, data, size, &count, &overlapped); + if (!r && GetLastError() == ERROR_IO_PENDING) + { + WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); + } if (!r || count != size) { WINE_ERR("service protocol error - failed to write pipe!\n"); return FALSE; } - r = ReadFile(pipe, result, sizeof *result, &count, NULL); + r = ReadFile(pipe, result, sizeof *result, &count, &overlapped); + if (!r && GetLastError() == ERROR_IO_PENDING) + { + WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); + } if (!r || count != sizeof *result) { WINE_ERR("service protocol error - failed to read pipe " diff --git a/programs/services/services.c b/programs/services/services.c index 2b1b8c5..35edbba 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -95,6 +95,7 @@ void free_service_entry(struct service_entry *entry) HeapFree(GetProcessHeap(), 0, entry->dependOnGroups); CloseHandle(entry->control_mutex); CloseHandle(entry->control_pipe); + CloseHandle(entry->overlapped_event); CloseHandle(entry->status_changed_event); HeapFree(GetProcessHeap(), 0, entry); } @@ -672,8 +673,10 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL /****************************************************************************** * service_send_start_message */ -static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *argv, DWORD argc) +static BOOL service_send_start_message(struct service_entry *service, HANDLE process_handle, + LPCWSTR *argv, DWORD argc) { + OVERLAPPED overlapped; DWORD i, len, result; service_start_info *ssi; LPWSTR p; @@ -681,12 +684,27 @@ static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *a WINE_TRACE("%s %p %d\n", wine_dbgstr_w(service->name), argv, argc); - /* FIXME: this can block so should be done in another thread */ - r = ConnectNamedPipe(service->control_pipe, NULL); - if (!r && GetLastError() != ERROR_PIPE_CONNECTED) + overlapped.hEvent = service->overlapped_event; + if (!ConnectNamedPipe(service->control_pipe, &overlapped)) { - WINE_ERR("pipe connect failed\n"); - return FALSE; + if (GetLastError() == ERROR_IO_PENDING) + { + HANDLE handles[2]; + handles[0] = service->overlapped_event; + handles[1] = process_handle; + if (WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ) != WAIT_OBJECT_0) + CancelIo( service->control_pipe ); + if (!HasOverlappedCompleted( &overlapped )) + { + WINE_ERR( "service %s failed to start\n", wine_dbgstr_w( service->name )); + return FALSE; + } + } + else if (GetLastError() != ERROR_PIPE_CONNECTED) + { + WINE_ERR("pipe connect failed\n"); + return FALSE; + } } /* calculate how much space do we need to send the startup info */ @@ -743,9 +761,11 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (!service->status_changed_event) service->status_changed_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!service->overlapped_event) + service->overlapped_event = CreateEventW(NULL, TRUE, FALSE, NULL); name = service_get_pipe_name(); - service->control_pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX, + service->control_pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL ); HeapFree(GetProcessHeap(), 0, name); if (service->control_pipe==INVALID_HANDLE_VALUE) @@ -760,7 +780,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err == ERROR_SUCCESS) { - if (!service_send_start_message(service, service_argv, service_argc)) + if (!service_send_start_message(service, process_handle, service_argv, service_argc)) err = ERROR_SERVICE_REQUEST_TIMEOUT; } diff --git a/programs/services/services.h b/programs/services/services.h index 63154c8..448ddfa 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -44,6 +44,7 @@ struct service_entry LPWSTR dependOnGroups; HANDLE control_mutex; HANDLE control_pipe; + HANDLE overlapped_event; HANDLE status_changed_event; };

1 0

Alexandre Julliard : services: Load some timeout parameters from the registry.
by Alexandre Julliard 20 May '11

20 May '11

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

Alexandre Julliard : services: Add a helper function to send a command to the service.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 0c1c1fc20db69fd6bfb7dae70de5f9e9793d5c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1c1fc20db69fd6bfb7dae70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 11:49:02 2011 +0200 services: Add a helper function to send a command to the service. --- programs/services/rpc.c | 39 ++++++++++++++++++++++++++++----------- programs/services/services.c | 14 +++++--------- programs/services/services.h | 2 ++ 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index cf1f814..d1dd39e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -888,12 +888,37 @@ static BOOL service_accepts_control(const struct service_entry *service, DWORD d } /****************************************************************************** + * service_send_command + */ +BOOL service_send_command( struct service_entry *service, HANDLE pipe, + const void *data, DWORD size, DWORD *result ) +{ + DWORD count; + BOOL r; + + r = WriteFile(pipe, data, size, &count, NULL); + if (!r || count != size) + { + WINE_ERR("service protocol error - failed to write pipe!\n"); + return FALSE; + } + r = ReadFile(pipe, result, sizeof *result, &count, NULL); + if (!r || count != sizeof *result) + { + WINE_ERR("service protocol error - failed to read pipe " + "r = %d count = %d!\n", r, count); + return FALSE; + } + return r; +} + +/****************************************************************************** * service_send_control */ static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWORD dwControl, DWORD *result) { service_start_info *ssi; - DWORD len, count = 0; + DWORD len; BOOL r; /* calculate how much space we need to send the startup info */ @@ -906,16 +931,8 @@ static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWO ssi->name_size = strlenW(service->name) + 1; strcpyW( ssi->data, service->name ); - r = WriteFile(pipe, ssi, ssi->total_size, &count, NULL); - if (!r || count != ssi->total_size) - { - WINE_ERR("service protocol error - failed to write pipe!\n"); - return r; - } - r = ReadFile(pipe, result, sizeof *result, &count, NULL); - if (!r || count != sizeof *result) - WINE_ERR("service protocol error - failed to read pipe " - "r = %d count = %d!\n", r, count); + r = service_send_command( service, pipe, ssi, ssi->total_size, result ); + HeapFree( GetProcessHeap(), 0, ssi ); return r; } diff --git a/programs/services/services.c b/programs/services/services.c index 5d0e4be..b3ed1a3 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -671,7 +671,7 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL */ static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *argv, DWORD argc) { - DWORD i, len, count, result; + DWORD i, len, result; service_start_info *ssi; LPWSTR p; BOOL r; @@ -708,15 +708,11 @@ static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *a } *p=0; - r = WriteFile(service->control_pipe, ssi, ssi->total_size, &count, NULL); - if (r) + r = service_send_command( service, service->control_pipe, ssi, ssi->total_size, &result ); + if (r && result) { - r = ReadFile(service->control_pipe, &result, sizeof result, &count, NULL); - if (r && result) - { - SetLastError(result); - r = FALSE; - } + SetLastError(result); + r = FALSE; } HeapFree(GetProcessHeap(),0,ssi); diff --git a/programs/services/services.h b/programs/services/services.h index cd7de02..ea917f4 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -75,6 +75,8 @@ void service_lock_shared(struct service_entry *service); void service_lock_exclusive(struct service_entry *service); void service_unlock(struct service_entry *service); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); +BOOL service_send_command( struct service_entry *service, HANDLE pipe, + const void *data, DWORD size, DWORD *result ); extern HANDLE g_hStartedEvent;

1 0

Gerald Pfeifer : wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: be57450fee3cbe57300630bbc4b7b80d969c8144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be57450fee3cbe57300630bbc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 19 08:24:23 2011 -0600 wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT. --- dlls/wineoss.drv/mmdevdrv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7dec1e0..0edcb25 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,13 @@ #include "audiopolicy.h" #include "audioclient.h" + +/* Some implementations of OSS, such as FreeBSD older than 9.0, lack + SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */ +#ifndef SNDCTL_DSP_HALT +#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +#endif + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

1 0

Dylan Smith : d3dxof: Remove assumption of 4 bytes pointers for LPSTR value .
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 0857d2b26bb4bd831cd1ee2de2586e6248c06d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0857d2b26bb4bd831cd1ee2de… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 19 18:35:17 2011 -0400 d3dxof: Remove assumption of 4 bytes pointers for LPSTR value. --- dlls/d3dxof/parsing.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c3bfba0..417194b 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1140,7 +1140,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) { get_TOKEN(buf); TRACE("%s = %s\n", pt->members[i].name, (char*)buf->value); - if (!check_buffer(buf, 4)) + if (!check_buffer(buf, sizeof(LPSTR))) return FALSE; if (pt->members[i].type == TOKEN_LPSTR) { @@ -1153,7 +1153,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) strcpy((char*)buf->cur_pstrings, (char*)buf->value); *(((LPCSTR*)(buf->cur_pos_data + buf->pdata))) = (char*)buf->cur_pstrings; buf->cur_pstrings += len; - buf->cur_pos_data += 4; + buf->cur_pos_data += sizeof(LPSTR); } else {

1 0

Dylan Smith : d3dx9/tests: Fix a normal comparison for triangles with zero area.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 147e1200495bd947775f6873d420a46d218caa59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147e1200495bd947775f6873d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu May 19 18:35:02 2011 -0400 d3dx9/tests: Fix a normal comparison for triangles with zero area. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 5367745..c8853cd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2785,7 +2785,7 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str D3DXVec3Subtract(&v2, vtx3, vtx2); D3DXVec3Cross(&normal, &v1, &v2); D3DXVec3Normalize(&normal, &normal); - ok(compare_vec3(normal, forward), + ok(!D3DXVec3Length(&normal) || compare_vec3(normal, forward), "Test %s, glyph %d, face %d normal, result (%g, %g, %g), expected (%g, %g, %g)\n", name, i, face_idx1, normal.x, normal.y, normal.z, forward.x, forward.y, forward.z); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011