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

Dylan Smith : include: Replace a THIS, with THIS_ for a method with parameters.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Alexandre Julliard : services: Add a timeout to all pipe communications with the service process.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

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

May 20, 2011

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

Rico Schüller : d3dx9: Parse effect samplers.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Piotr Caban : msvcrt: Fix __pctype_func implementation.
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Lucas Fialho Zawacki : include: Added dinput8 DIKEYBOARD_* key definitions correspondent to the DIK_* already present in the header .
by Alexandre Julliard May 20, 2011

May 20, 2011

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

Marcus Meissner : localspl: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 340be4feb70442bdcb27ba7590bac80129d81323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340be4feb70442bdcb27ba759… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:20:55 2011 +0200 localspl: Mark internal symbols with hidden visibility. --- dlls/localspl/localspl_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 952c1f6..8c49623 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -24,8 +24,8 @@ #include <windef.h> /* ## DLL-wide Globals ## */ -extern HINSTANCE LOCALSPL_hInstance; -void setup_provider(void); +extern HINSTANCE LOCALSPL_hInstance DECLSPEC_HIDDEN; +void setup_provider(void) DECLSPEC_HIDDEN; /* ## Resource-ID ## */ #define IDS_LOCALPORT 500

1 0

Stefan Dösinger : d3d9: Account for another different behavior in the viewport test.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 803bad09592c8b57a9bec3ac2661ce7c9067a17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=803bad09592c8b57a9bec3ac2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 30 22:18:31 2011 +0100 d3d9: Account for another different behavior in the viewport test. --- dlls/d3d9/tests/visual.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 439b5cc..ffee8de 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10394,9 +10394,15 @@ static void viewport_test(IDirect3DDevice9 *device) { * TODO: Test Width < surface.width, but X + Width > surface.width * TODO: Test Width < surface.width, what happens with the height? * - * Note that Windows 7 rejects MinZ / MaxZ outside [0;1], but accepts Width - * and Height fields bigger than the framebuffer. However, it later refuses - * to draw. + * The expected behavior is that the viewport behaves like the "default" + * viewport with X = Y = 0, Width = surface_width, Height = surface_height, + * MinZ = 0.0, MaxZ = 1.0. + * + * Starting with Windows 7 the behavior among driver versions is not + * consistent. The SetViewport call is accepted on all drivers. Some + * drivers(older nvidia ones) refuse to draw and return an error. Newer + * nvidia drivers draw, but use the actual values in the viewport and only + * display the upper left part on the surface. */ memset(&vp, 0, sizeof(vp)); vp.X = 0; @@ -10430,10 +10436,10 @@ static void viewport_test(IDirect3DDevice9 *device) { color = getPixelColor(device, 158, 122); ok(color == 0x00ff0000, "viewport test: (158,122) has color %08x\n", color); color = getPixelColor(device, 162, 122); - ok(color == 0x00ffffff, "viewport test: (162,122) has color %08x\n", color); + ok(color == 0x00ffffff || broken(color == 0x00ff0000), "viewport test: (162,122) has color %08x\n", color); color = getPixelColor(device, 478, 358); - ok(color == 0x00ffffff, "viewport test: (478,358 has color %08x\n", color); + ok(color == 0x00ffffff || broken(color == 0x00ff0000), "viewport test: (478,358 has color %08x\n", color); color = getPixelColor(device, 482, 358); ok(color == 0x00ff0000, "viewport test: (482,358) has color %08x\n", color); color = getPixelColor(device, 478, 362);

1 0

Marcus Meissner : mmdevapi: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: dc5c9c5595fd507101e2038bfee1f8c901e1c28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5c9c5595fd507101e2038bf… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:24:42 2011 +0200 mmdevapi: Mark internal symbols with hidden visibility. --- dlls/mmdevapi/mmdevapi.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 405aa7a..9740395 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -20,10 +20,10 @@ # error You must include config.h to use this header #endif -extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv); -extern void MMDevEnum_Free(void); +extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; +extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; -extern HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY key, PROPVARIANT *pv); +extern HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERTYKEY key, PROPVARIANT *pv) DECLSPEC_HIDDEN; typedef struct _DriverFuncs { HMODULE module; @@ -39,7 +39,7 @@ typedef struct _DriverFuncs { EDataFlow dataflow, IAudioClient **out); } DriverFuncs; -extern DriverFuncs drvs; +extern DriverFuncs drvs DECLSPEC_HIDDEN; typedef struct MMDevice { IMMDevice IMMDevice_iface; @@ -55,5 +55,5 @@ typedef struct MMDevice { void *key; } MMDevice; -extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv); -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv); +extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN;

1 0

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

May 20, 2011

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