August 2013 - Wine-Commits - list.winehq.org

Hans Leidekker : rpcrt4: Remove an unneeded parameter from RPCRT4_BuildHttpConnectHeader.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 9d213312f1aad48912e016552208fe1a6aea622d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d213312f1aad48912e016552… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 13:30:41 2013 +0200 rpcrt4: Remove an unneeded parameter from RPCRT4_BuildHttpConnectHeader. --- dlls/rpcrt4/rpc_message.c | 4 ++-- dlls/rpcrt4/rpc_message.h | 2 +- dlls/rpcrt4/rpc_transport.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 189f6c4..1c4ffd6 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -340,7 +340,7 @@ RpcPktHdr *RPCRT4_BuildHttpHeader(ULONG DataRepresentation, (payload) += sizeof(UUID); \ } while (0) -RpcPktHdr *RPCRT4_BuildHttpConnectHeader(unsigned short flags, int out_pipe, +RpcPktHdr *RPCRT4_BuildHttpConnectHeader(int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) @@ -353,7 +353,7 @@ RpcPktHdr *RPCRT4_BuildHttpConnectHeader(unsigned short flags, int out_pipe, if (!out_pipe) size += 8 + 4 + sizeof(UUID); - header = RPCRT4_BuildHttpHeader(NDR_LOCAL_DATA_REPRESENTATION, flags, + header = RPCRT4_BuildHttpHeader(NDR_LOCAL_DATA_REPRESENTATION, 0, out_pipe ? 4 : 6, size); if (!header) return NULL; payload = (char *)(&header->http+1); diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 3ad8761..a3729cc 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -31,7 +31,7 @@ RpcPktHdr *RPCRT4_BuildBindHeader(ULONG DataRepresentation, unsigned short MaxTr RpcPktHdr *RPCRT4_BuildBindNackHeader(ULONG DataRepresentation, unsigned char RpcVersion, unsigned char RpcVersionMinor, unsigned short RejectReason) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildBindAckHeader(ULONG DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, ULONG AssocGroupId, LPCSTR ServerAddress, unsigned char ResultCount, const RpcResult *Results) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildHttpHeader(ULONG DataRepresentation, unsigned short flags, unsigned short num_data_items, unsigned int payload_size) DECLSPEC_HIDDEN; -RpcPktHdr *RPCRT4_BuildHttpConnectHeader(unsigned short flags, int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) DECLSPEC_HIDDEN; +RpcPktHdr *RPCRT4_BuildHttpConnectHeader(int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildHttpFlowControlHeader(BOOL server, ULONG bytes_transmitted, ULONG flow_control_increment, const UUID *pipe_uuid) DECLSPEC_HIDDEN; VOID RPCRT4_FreeHeader(RpcPktHdr *Header) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 00d03e4..6b808de 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2232,7 +2232,7 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync if (status != RPC_S_OK) return status; TRACE("sending HTTP connect header to server\n"); - hdr = RPCRT4_BuildHttpConnectHeader(0, FALSE, connection_uuid, in_pipe_uuid, association_uuid); + hdr = RPCRT4_BuildHttpConnectHeader(FALSE, connection_uuid, in_pipe_uuid, association_uuid); if (!hdr) return RPC_S_OUT_OF_RESOURCES; ret = InternetWriteFile(in_request, hdr, hdr->common.frag_len, &bytes_written); RPCRT4_FreeHeader(hdr); @@ -2308,7 +2308,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, status = send_echo_request(out_request, async_data, cancel_event); if (status != RPC_S_OK) return status; - hdr = RPCRT4_BuildHttpConnectHeader(0, TRUE, connection_uuid, out_pipe_uuid, NULL); + hdr = RPCRT4_BuildHttpConnectHeader(TRUE, connection_uuid, out_pipe_uuid, NULL); if (!hdr) return RPC_S_OUT_OF_RESOURCES; prepare_async_request(async_data);

1 0

Hans Leidekker : rpcrt4: Add support for session cookies.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: a2f6e92acd549122c4a38c274963547a01d73249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f6e92acd549122c4a38c274… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 13:30:03 2013 +0200 rpcrt4: Add support for session cookies. --- dlls/rpcrt4/rpc_assoc.c | 4 +- dlls/rpcrt4/rpc_assoc.h | 4 ++- dlls/rpcrt4/rpc_binding.c | 27 +++++++++++++++++++++- dlls/rpcrt4/rpc_binding.h | 6 ++++- dlls/rpcrt4/rpc_transport.c | 50 +++++++++++++++++++++++++++++++++++------- include/rpcdcep.h | 8 +++++++ 6 files changed, 84 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2f6e92acd549122c4a38…

1 0

André Hentschel : msvcr90/tests: Add more ARM forwards and use them in tests.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 7ae776c26b767989a7f43d88a657f2f5b5e0b630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae776c26b767989a7f43d88a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 27 23:52:38 2013 +0200 msvcr90/tests: Add more ARM forwards and use them in tests. --- dlls/msvcr90/msvcr90.spec | 5 +++++ dlls/msvcr90/tests/msvcr90.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d5eebb4..04fa199 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -28,6 +28,7 @@ @ cdecl -arch=win64 ??1bad_typeid(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_typeid@@UEAA(a)XZ @ thiscall -arch=i386 ??1exception(a)std@@UAE(a)XZ(ptr) msvcrt.??1exception@@UAE(a)XZ @ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) msvcrt.??1exception@@UEAA(a)XZ +@ cdecl -arch=arm ??1type_info@@UAA(a)XZ(ptr) msvcrt.??1type_info@@UAA(a)XZ @ thiscall -arch=i386 ??1type_info@@UAE(a)XZ(ptr) msvcrt.??1type_info@@UAE(a)XZ @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ @ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) MSVCR90_operator_new @@ -44,8 +45,10 @@ @ cdecl -arch=win64 ??4bad_typeid(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4exception(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4exception(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0(a)AEBV0@@Z +@ cdecl -arch=arm ??8type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z +@ cdecl -arch=arm ??9type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z @ extern ??_7__non_rtti_object(a)std@@6B@ msvcrt.??_7__non_rtti_object@@6B@ @@ -83,6 +86,7 @@ @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K(a)Z(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *) @ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64) +@ cdecl -arch=arm ?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z @ thiscall -arch=i386 ?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z @ cdecl -arch=win64 ?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z @ varargs -arch=win32 ?_open@@YAHPBDHH(a)Z(str long) msvcrt._open @@ -111,6 +115,7 @@ @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBAPBDXZ @ thiscall -arch=i386 ?raw_name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QEBAPEBDXZ @ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ(a)Z diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index fa2b445..2a3124d 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -315,8 +315,13 @@ static BOOL init(void) } else { +#ifdef __arm__ + SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z"); + SET(ptype_info_dtor, "??1type_info@@UAA(a)XZ"); +#else SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z"); SET(ptype_info_dtor, "??1type_info@@UAE(a)XZ"); +#endif } hkernel32 = GetModuleHandleA("kernel32.dll");

1 0

André Hentschel : secur32/tests: Better defined InitializeSecurityContext tests.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 3a0961aced2b3dde44cd7bc726b96e73b7d0918e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0961aced2b3dde44cd7bc72… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 27 22:17:35 2013 +0200 secur32/tests: Better defined InitializeSecurityContext tests. --- dlls/secur32/tests/schannel.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 0bb07bf..e0d550c 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -694,10 +694,20 @@ static void test_communication(void) buffers[1].cBuffers = 1; buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pBuffers[0].cbBuffer = 1; status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); +todo_wine + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); +todo_wine + ok(status == SEC_E_INSUFFICIENT_MEMORY || status == SEC_E_INVALID_TOKEN, + "Expected SEC_E_INSUFFICIENT_MEMORY or SEC_E_INVALID_TOKEN, got %08x\n", status); buffers[0].pBuffers[0].cbBuffer = buf_size;

1 0

Henri Verbeet : d3dx9: Simplify D3DXLoadSurfaceFromResourceA().
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: d16402b10cca1d939387b8a8976d27c49487d6ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16402b10cca1d939387b8a89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:59 2013 +0200 d3dx9: Simplify D3DXLoadSurfaceFromResourceA(). --- dlls/d3dx9_36/surface.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4b86f1c..a2b553b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1240,7 +1240,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceA(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, HMODULE src_module, const char *resource, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - HRSRC hResInfo; + UINT data_size; + HRSRC resinfo; + void *data; TRACE("dst_surface %p, dst_palette %p, dst_rect %s, src_module %p, resource %s, " "src_rect %s, filter %#x, color_key 0x%08x, src_info %p.\n", @@ -1250,23 +1252,16 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceA(IDirect3DSurface9 *dst_surface, if (!dst_surface) return D3DERR_INVALIDCALL; - hResInfo = FindResourceA(src_module, resource, (const char *)RT_RCDATA); - if (!hResInfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - hResInfo = FindResourceA(src_module, resource, (const char *)RT_BITMAP); - - if (hResInfo) - { - UINT data_size; - void *data; - - if (FAILED(load_resource_into_memory(src_module, hResInfo, &data, &data_size))) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceA(src_module, resource, (const char *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceA(src_module, resource, (const char *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - return D3DXLoadSurfaceFromFileInMemory(dst_surface, dst_palette, dst_rect, - data, data_size, src_rect, filter, color_key, src_info); - } + if (FAILED(load_resource_into_memory(src_module, resinfo, &data, &data_size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXLoadSurfaceFromFileInMemory(dst_surface, dst_palette, dst_rect, + data, data_size, src_rect, filter, color_key, src_info); } HRESULT WINAPI D3DXLoadSurfaceFromResourceW(IDirect3DSurface9 *dst_surface,

1 0

Henri Verbeet : wined3d: Get rid of GL_EXT_paletted_texture support.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: f5f7a4e4578e541b07ac324667874c26374ccc7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f7a4e4578e541b07ac32466… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:57 2013 +0200 wined3d: Get rid of GL_EXT_paletted_texture support. No current drivers support this, and it's probably broken. Also note that since we removed paletted texture support from wined3d, this would only be used for WINED3DFMT_P8_UINT blits. --- dlls/wined3d/directx.c | 1 - dlls/wined3d/surface.c | 72 ++++----------------------------------------- dlls/wined3d/texture.c | 10 ++---- dlls/wined3d/utils.c | 6 +--- dlls/wined3d/wined3d_gl.h | 3 -- 5 files changed, 10 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5f7a4e4578e541b07ac3…

1 0

Hans Leidekker : wbemprox: Avoid a crash on file or directory queries with an empty WHERE clause.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 7da04aab6d0166005beb776f2135707fc57d716e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da04aab6d0166005beb776f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 09:49:05 2013 +0200 wbemprox: Avoid a crash on file or directory queries with an empty WHERE clause. --- dlls/wbemprox/builtin.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9e2369a..d310704 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1085,9 +1085,12 @@ static BOOL seen_dir( struct dirstack *dirstack, const WCHAR *path ) /* optimize queries of the form WHERE Name='...' [OR Name='...']* */ static UINT seed_dirs( struct dirstack *dirstack, const struct expr *cond, WCHAR root, UINT *count ) { - const struct expr *left = cond->u.expr.left, *right = cond->u.expr.right; + const struct expr *left, *right; - if (cond->type != EXPR_COMPLEX) return *count = 0; + if (!cond || cond->type != EXPR_COMPLEX) return *count = 0; + + left = cond->u.expr.left; + right = cond->u.expr.right; if (cond->u.expr.op == OP_EQ) { UINT len;

1 0

Nikolay Sivov : kernel32: Simplify constant string length calculation.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: 9bf8a5ec6fca6416952ff17fc678596cbb274183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf8a5ec6fca6416952ff17fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 28 08:36:48 2013 +0400 kernel32: Simplify constant string length calculation. --- dlls/kernel32/volume.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 2e0cc8a..72b04df 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1031,7 +1031,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWORD size ) { static const WCHAR prefixW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; - static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{',0}; + static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{'}; static const WCHAR trailingW[] = {'\\',0}; MOUNTMGR_MOUNT_POINT *input = NULL, *o1; @@ -1133,7 +1133,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR debugstr_wn((WCHAR*)((char *)output + o1->DeviceNameOffset), o1->DeviceNameLength/sizeof(WCHAR))); - if (!strncmpW( p, volumeW, (sizeof(volumeW)-1)/sizeof(WCHAR) )) + if (!strncmpW( p, volumeW, sizeof(volumeW)/sizeof(WCHAR) )) { /* is there space in the return variable ?? */ if ((o1->SymbolicLinkNameLength/sizeof(WCHAR))+2 > size)

1 0

Alexandre Julliard : server: Store abandoned state as a flag in the wait structure.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: d4cd051cef5efc5f2898903fb048678e631920c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4cd051cef5efc5f2898903fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 26 12:56:41 2013 +0200 server: Store abandoned state as a flag in the wait structure. --- server/event.c | 5 ++--- server/mutex.c | 8 +++----- server/object.c | 3 +-- server/object.h | 6 +++--- server/queue.c | 5 ++--- server/semaphore.c | 5 ++--- server/thread.c | 22 +++++++++++++--------- server/thread.h | 1 + server/timer.c | 5 ++--- 9 files changed, 29 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4cd051cef5efc5f28989…

1 0

André Hentschel : msvcr80: Add more ARM forwards.
by Alexandre Julliard Aug. 28, 2013

Aug. 28, 2013

Module: wine Branch: master Commit: feffbd5d86f71fdc0477f6e157c6acc460befabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=feffbd5d86f71fdc0477f6e15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 27 23:52:17 2013 +0200 msvcr80: Add more ARM forwards. --- dlls/msvcr80/msvcr80.spec | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ec886eb..6eeb602 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -28,6 +28,7 @@ @ cdecl -arch=win64 ??1bad_typeid(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_typeid@@UEAA(a)XZ @ thiscall -arch=i386 ??1exception(a)std@@UAE(a)XZ(ptr) msvcrt.??1exception@@UAE(a)XZ @ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) msvcrt.??1exception@@UEAA(a)XZ +@ cdecl -arch=arm ??1type_info@@UAA(a)XZ(ptr) msvcrt.??1type_info@@UAA(a)XZ @ thiscall -arch=i386 ??1type_info@@UAE(a)XZ(ptr) msvcrt.??1type_info@@UAE(a)XZ @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ @ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) msvcrt.??2(a)YAPAXI@Z @@ -44,8 +45,10 @@ @ cdecl -arch=win64 ??4bad_typeid(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4exception(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4exception(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0(a)AEBV0@@Z +@ cdecl -arch=arm ??8type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z +@ cdecl -arch=arm ??9type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z @ extern ??_7__non_rtti_object(a)std@@6B@ msvcrt.??_7__non_rtti_object@@6B@ @@ -83,6 +86,7 @@ @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K(a)Z(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *) @ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64) +@ cdecl -arch=arm ?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QBAPBDPAU__type_info_node@@@Z @ thiscall -arch=i386 ?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QBEPBDPAU__type_info_node@@@Z @ cdecl -arch=win64 ?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z @ varargs -arch=win32 ?_open@@YAHPBDHH(a)Z(str long) msvcrt._open @@ -111,6 +115,7 @@ @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBAPBDXZ @ thiscall -arch=i386 ?raw_name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QEBAPEBDXZ @ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ(a)Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ(a)Z

1 0