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

Wolfgang Walter : kernel32: Fix TRACE output: IXON and IXOFF are swapped.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: ce1952446a551547e439838d5c316df9aa3eebcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce1952446a551547e439838d5… Author: Wolfgang Walter <wine(a)stwm.de> Date: Fri Dec 12 11:52:13 2008 +0100 kernel32: Fix TRACE output: IXON and IXOFF are swapped. --- dlls/kernel32/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 9653d6e..096bc42 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -774,7 +774,7 @@ static void dump_dcb(const DCB* lpdcb) lpdcb->ByteSize, lpdcb->BaudRate, lpdcb->fParity, lpdcb->Parity, (lpdcb->StopBits == ONESTOPBIT) ? 1 : (lpdcb->StopBits == TWOSTOPBITS) ? 2 : 0); - TRACE("%sIXON %sIXOFF\n", (lpdcb->fInX) ? "" : "~", (lpdcb->fOutX) ? "" : "~"); + TRACE("%sIXON %sIXOFF\n", (lpdcb->fOutX) ? "" : "~", (lpdcb->fInX) ? "" : "~"); TRACE("fOutxCtsFlow=%d fRtsControl=%d\n", lpdcb->fOutxCtsFlow, lpdcb->fRtsControl); TRACE("fOutxDsrFlow=%d fDtrControl=%d\n", lpdcb->fOutxDsrFlow, lpdcb->fDtrControl); if (lpdcb->fOutxCtsFlow || lpdcb->fRtsControl == RTS_CONTROL_HANDSHAKE)

1 0

André Hentschel : dbghelp: Set the right ARM frame pointer.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: e0d14005ce63f07b9181044b4ebea48a2eb08280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d14005ce63f07b9181044b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 18 19:58:45 2011 +0200 dbghelp: Set the right ARM frame pointer. --- dlls/dbghelp/cpu_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 365caa3..4f54ef4 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -120,7 +120,7 @@ static const char* arm_fetch_regname(unsigned regno) struct cpu cpu_arm = { IMAGE_FILE_MACHINE_ARM, 4, - CV_ARM_NOREG, /* FIXME */ + CV_ARM_R0 + 11, arm_get_addr, arm_stack_walk, NULL,

1 0

Alexandre Julliard : ws2_32: Merge ioctlsocket implementation into WSAIoctl .
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 7e208f4896806e74e0ea04eb0928d2cac83630f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e208f4896806e74e0ea04eb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 11:57:37 2011 +0200 ws2_32: Merge ioctlsocket implementation into WSAIoctl. --- dlls/ws2_32/socket.c | 130 +++++++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 81 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ca6f27e..303462d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3068,30 +3068,62 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID DWORD out_size, LPDWORD ret_size, LPWSAOVERLAPPED overlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE completion ) { + int fd; + TRACE("%ld, 0x%08x, %p, %d, %p, %d, %p, %p, %p\n", s, code, in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); switch (code) { case WS_FIONBIO: - if (in_size != sizeof(WS_u_long)) { + if (in_size != sizeof(WS_u_long) || IS_INTRESOURCE(in_buff)) + { WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } - return WS_ioctlsocket( s, WS_FIONBIO, in_buff); + if (_get_sock_mask(s)) + { + /* AsyncSelect()'ed sockets are always nonblocking */ + if (*(WS_u_long *)in_buff) return 0; + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + if (*(WS_u_long *)in_buff) + _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); + else + _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); + return 0; - case WS_FIONREAD: - if (out_size != sizeof(WS_u_long)) { + case WS_FIONREAD: + case WS_SIOCATMARK: + { + int cmd = code == WS_FIONREAD ? FIONREAD : SIOCATMARK; + if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) + { WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } - return WS_ioctlsocket( s, WS_FIONREAD, out_buff); + if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; + if (ioctl(fd, cmd, out_buff ) == -1) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + release_sock_fd( s, fd ); + return SOCKET_ERROR; + } + release_sock_fd( s, fd ); + if (ret_size) *ret_size = sizeof(WS_u_long); + return 0; + } + + case WS_FIOASYNC: + WARN("Warning: WS1.1 shouldn't be using async I/O\n"); + SetLastError(WSAEINVAL); + return SOCKET_ERROR; case WS_SIO_GET_INTERFACE_LIST: { INTERFACE_INFO* intArray = out_buff; DWORD size, numInt, apiReturn; - int fd; TRACE("-> SIO_GET_INTERFACE_LIST request\n"); @@ -3355,7 +3387,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_KEEPALIVE_VALS: { - int fd; struct tcp_keepalive *k = in_buff; int keepalive = k->onoff ? 1 : 0; int keepidle = k->keepalivetime / 1000; @@ -3483,13 +3514,16 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; - default: - FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); - WSASetLastError(WSAEOPNOTSUPP); - return SOCKET_ERROR; - } + case 0x667e: /* Netscape tries hard to use bogus ioctl 0x667e */ + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + default: + FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + } - return 0; + return 0; } @@ -3498,74 +3532,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID */ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) { - int fd; - LONG newcmd = cmd; - - TRACE("socket %04lx, cmd %08x, ptr %p\n", s, cmd, argp); - /* broken apps like defcon pass the argp value directly instead of a pointer to it */ - if(IS_INTRESOURCE(argp)) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - switch( cmd ) - { - case WS_FIONREAD: - newcmd=FIONREAD; - break; - - case WS_FIONBIO: - if( _get_sock_mask(s) ) - { - /* AsyncSelect()'ed sockets are always nonblocking */ - if (*argp) return 0; - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - } - if (*argp) - _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); - else - _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); - return 0; - - case WS_SIOCATMARK: - newcmd=SIOCATMARK; - break; - - case WS_FIOASYNC: - WARN("Warning: WS1.1 shouldn't be using async I/O\n"); - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - - case SIOCGIFBRDADDR: - case SIOCGIFNETMASK: - case SIOCGIFADDR: - /* These don't need any special handling. They are used by - WsControl, and are here to suppress an unnecessary warning. */ - break; - - default: - /* Netscape tries hard to use bogus ioctl 0x667e */ - /* FIXME: 0x667e above is ('f' << 8) | 126, and is a low word of - * FIONBIO (_IOW('f', 126, u_long)), how that should be handled? - */ - WARN("\tunknown WS_IOCTL cmd (%08x)\n", cmd); - break; - } - - fd = get_sock_fd( s, 0, NULL ); - if (fd != -1) - { - if( ioctl(fd, newcmd, (char*)argp ) == 0 ) - { - release_sock_fd( s, fd ); - return 0; - } - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); - release_sock_fd( s, fd ); - } - return SOCKET_ERROR; + DWORD ret_size; + return WSAIoctl( s, cmd, argp, sizeof(WS_u_long), argp, sizeof(WS_u_long), &ret_size, NULL, NULL ); } /***********************************************************************

1 0

Henri Verbeet : ddraw: Verify the viewport belongs to the device on execute buffer execution.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: d429aaa9e9d03e644914ae7fad4f3bef82f8f8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d429aaa9e9d03e644914ae7fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:08:00 2011 +0200 ddraw: Verify the viewport belongs to the device on execute buffer execution. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 5 +++-- dlls/ddraw/executebuffer.c | 16 +++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a6cab70..5cc09dd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -515,8 +515,8 @@ HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer, IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN; /* The execute function */ -void IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, - IDirect3DDeviceImpl *Device, IDirect3DViewportImpl *ViewportImpl) DECLSPEC_HIDDEN; +HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *execute_buffer, + IDirect3DDeviceImpl *device, IDirect3DViewportImpl *viewport) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexBuffer diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 80ee926..984afc3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -718,6 +718,7 @@ IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DExecuteBufferImpl *Direct3DExecuteBufferImpl = (IDirect3DExecuteBufferImpl *)ExecuteBuffer; IDirect3DViewportImpl *Direct3DViewportImpl = (IDirect3DViewportImpl *)Viewport; + HRESULT hr; TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags); @@ -726,10 +727,10 @@ IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface, /* Execute... */ EnterCriticalSection(&ddraw_cs); - IDirect3DExecuteBufferImpl_Execute(Direct3DExecuteBufferImpl, This, Direct3DViewportImpl); + hr = d3d_execute_buffer_execute(Direct3DExecuteBufferImpl, This, Direct3DViewportImpl); LeaveCriticalSection(&ddraw_cs); - return D3D_OK; + return hr; } /***************************************************************************** diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index d4d2dd0..070cdc7 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -68,10 +68,8 @@ static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { * Viewport: Viewport for this operation * *****************************************************************************/ -void -IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, - IDirect3DDeviceImpl *lpDevice, - IDirect3DViewportImpl *lpViewport) +HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This, + IDirect3DDeviceImpl *lpDevice, IDirect3DViewportImpl *lpViewport) { /* DWORD bs = This->desc.dwBufferSize; */ DWORD vs = This->data.dwVertexOffset; @@ -81,10 +79,14 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, char *instr = (char *)This->desc.lpData + is; - /* Should check if the viewport was added or not to the device */ + if (lpViewport->active_device != lpDevice) + { + WARN("Viewport %p active device is %p.\n", + lpViewport, lpViewport->active_device); + return DDERR_INVALIDPARAMS; + } /* Activate the viewport */ - lpViewport->active_device = lpDevice; viewport_activate(lpViewport, FALSE); TRACE("ExecuteData :\n"); @@ -551,7 +553,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, } end_of_buffer: - ; + return D3D_OK; } /*****************************************************************************

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechniqueByName().
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: fa608e247a114a266e7eff213d8eda9b2451612a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa608e247a114a266e7eff213… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:53 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechniqueByName(). --- dlls/d3dx9_36/effect.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f11b755..fefb3b4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -605,8 +605,28 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechnique(ID3DXBaseEffect *iface static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect *iface, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + unsigned int i; - FIXME("iface %p, name %s stub\n", This, debugstr_a(name)); + TRACE("iface %p, name %s stub\n", This, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + for (i = 0; i < This->technique_count; ++i) + { + struct d3dx_technique *tech = get_technique_struct(This->technique_handles[i]); + + if (!strcmp(tech->name, name)) + { + TRACE("Returning technique %p\n", This->technique_handles[i]); + return This->technique_handles[i]; + } + } + + WARN("Invalid argument specified.\n"); return NULL; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechnique().
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 6f824e171c27dadb3ea428cac61061d07c690dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f824e171c27dadb3ea428cac… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:48 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechnique(). --- dlls/d3dx9_36/effect.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d35978c..f11b755 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -589,9 +589,17 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechnique(ID3DXBaseEffect *iface { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - FIXME("iface %p, index %u stub\n", This, index); + TRACE("iface %p, index %u\n", This, index); - return NULL; + if (index >= This->technique_count) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + TRACE("Returning technique %p\n", This->technique_handles[index]); + + return This->technique_handles[index]; } static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect *iface, LPCSTR name)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetParameter().
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: e798d0016b2c5bc8c998ee32d37e839453ea99bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e798d0016b2c5bc8c998ee32d… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:44 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetParameter(). --- dlls/d3dx9_36/effect.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dc67864..d35978c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -171,6 +171,90 @@ struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DX return NULL; } +struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *param, D3DXHANDLE parameter) +{ + unsigned int i, count; + struct d3dx_parameter *p; + + for (i = 0; i < param->annotation_count; ++i) + { + if (param->annotation_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(param->annotation_handles[i]), parameter); + if (p) return p; + } + + if (param->element_count) count = param->element_count; + else count = param->member_count; + + for (i = 0; i < count; ++i) + { + if (param->member_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(param->member_handles[i]), parameter); + if (p) return p; + } + + return NULL; +} + +struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *base, D3DXHANDLE parameter) +{ + unsigned int i, k, m; + struct d3dx_parameter *p; + + for (i = 0; i < base->parameter_count; ++i) + { + if (base->parameter_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(base->parameter_handles[i]), parameter); + if (p) return p; + } + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *technique = get_technique_struct(base->technique_handles[i]); + + for (k = 0; k < technique->pass_count; ++k) + { + struct d3dx_pass *pass = get_pass_struct(technique->pass_handles[k]); + + for (m = 0; m < pass->annotation_count; ++m) + { + if (pass->annotation_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(pass->annotation_handles[m]), parameter); + if (p) return p; + } + } + + for (k = 0; k < technique->annotation_count; ++k) + { + if (technique->annotation_handles[k] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(technique->annotation_handles[k]), parameter); + if (p) return p; + } + } + + return NULL; +} + static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; @@ -448,7 +532,28 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameter(ID3DXBaseEffect *iface { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - FIXME("iface %p, parameter %p, index %u stub\n", This, parameter, index); + TRACE("iface %p, parameter %p, index %u\n", This, parameter, index); + + if (!parameter) + { + if (index < This->parameter_count) + { + TRACE("Returning parameter %p\n", This->parameter_handles[index]); + return This->parameter_handles[index]; + } + } + else + { + struct d3dx_parameter *param = is_valid_parameter(This, parameter); + + if (param && !param->element_count && index < param->member_count) + { + TRACE("Returning parameter %p\n", param->member_handles[index]); + return param->member_handles[index]; + } + } + + WARN("Invalid argument specified.\n"); return NULL; }

1 0

Rico Schüller : d3dx9: Fix d3dx9_parse_effect_typedef for D3DXPC_STRUCT.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 4482ca41d0466dcae8063345b9a71f5e4b905720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4482ca41d0466dcae8063345b… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:34 2011 +0200 d3dx9: Fix d3dx9_parse_effect_typedef for D3DXPC_STRUCT. --- dlls/d3dx9_36/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 66b5a40..595baba 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2734,6 +2734,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch if (param->element_count) { unsigned int param_bytes = 0; + const char *save_ptr = *ptr; member_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member_handles) * param->element_count); if (!member_handles) @@ -2746,6 +2747,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch for (i = 0; i < param->element_count; ++i) { struct d3dx_parameter *member; + *ptr = save_ptr; member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); if (!member)

1 0

Huw Davies : gdi32: Make sure that pattern brush bitmap' s are created with the correct physdev.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 94fbcd7ce286ee7c88d1a2ee0e02b9f1e7a4f4d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fbcd7ce286ee7c88d1a2ee0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 18 11:23:27 2011 +0100 gdi32: Make sure that pattern brush bitmap's are created with the correct physdev. --- dlls/gdi32/brush.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index a1d22fc..781e446 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -390,7 +390,15 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); if (brush->logbrush.lbStyle == BS_PATTERN) - BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, physdev ); + { + PHYSDEV pattern_dev = physdev; + /* FIXME: This will go away once the dib driver implements + pattern brushes */ + if(pattern_dev == &dc->dibdrv.dev) + pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); + + BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); + } GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle );

1 0

Alexandre Julliard : server: Store a mapping instead of a file for process dlls.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 900352bc6bd32c6524658083339ba119620be9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=900352bc6bd32c65246580833… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 18 14:14:40 2011 +0200 server: Store a mapping instead of a file for process dlls. --- dlls/ntdll/loader.c | 20 +++++++++++++------- include/wine/server_protocol.h | 4 ++-- server/debugger.c | 8 +++++--- server/file.c | 6 ------ server/file.h | 3 ++- server/mapping.c | 6 ++++++ server/process.c | 18 +++++++++--------- server/process.h | 2 +- server/protocol.def | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 11 files changed, 41 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=900352bc6bd32c6524658…

1 0