wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Alexandre Julliard : comctl32: Apply the imagelist mask when alpha blending .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 8ea1f3385a8035477c14997ac37ac511e5c9c7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea1f3385a8035477c14997ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 17:46:05 2010 +0200 comctl32: Apply the imagelist mask when alpha blending. --- dlls/comctl32/imagelist.c | 78 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 63f0ea0..a4dc2a9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -815,10 +815,7 @@ ImageList_InternalDragDraw (HDC hdc, INT x, INT y) imldp.rgbFg = CLR_DEFAULT; imldp.fStyle = ILD_NORMAL; imldp.fState = ILS_ALPHA; - imldp.Frame = 128; - - /* FIXME: instead of using the alpha blending, we should - * create a 50% mask, and draw it semitransparantly that way */ + imldp.Frame = 192; ImageList_DrawIndirect (&imldp); } @@ -1064,6 +1061,68 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, } +static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, + int src_x, int src_y, int cx, int cy, int alpha ) +{ + BLENDFUNCTION func; + BOOL ret = FALSE; + HDC hdc; + HBITMAP bmp = 0, mask = 0; + BITMAPINFO *info; + void *bits, *mask_bits; + unsigned int *ptr; + int i, j, has_alpha = 0; + + if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = cx; + info->bmiHeader.biHeight = cy; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = cx * cy * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(bmp = CreateDIBSection( himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; + SelectObject( hdc, bmp ); + BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); + + for (i = 0, ptr = bits; i < cx * cy; i++) if ((has_alpha = (ptr[i] & 0xff000000) != 0)) break; + + if (himl->hbmMask) + { + unsigned int width_bytes = (cx + 31) / 32 * 4; + /* generate alpha channel from the mask */ + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biSizeImage = width_bytes * cy; + if (!(mask = CreateDIBSection( himl->hdcMask, info, DIB_RGB_COLORS, &mask_bits, 0, 0 ))) + goto done; + SelectObject( hdc, mask ); + BitBlt( hdc, 0, 0, cx, cy, himl->hdcMask, src_x, src_y, SRCCOPY ); + SelectObject( hdc, bmp ); + for (i = 0, ptr = bits; i < cy; i++) + for (j = 0; j < cx; j++, ptr++) + if ((((BYTE *)mask_bits)[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr = 0; + else if (!has_alpha) *ptr |= 0xff000000; + } + + func.BlendOp = AC_SRC_OVER; + func.BlendFlags = 0; + func.SourceConstantAlpha = alpha; + func.AlphaFormat = AC_SRC_ALPHA; + ret = GdiAlphaBlend( dest_dc, dest_x, dest_y, cx, cy, hdc, 0, 0, cx, cy, func ); + +done: + DeleteDC( hdc ); + if (bmp) DeleteObject( bmp ); + if (mask) DeleteObject( mask ); + HeapFree( GetProcessHeap(), 0, info ); + return ret; +} + /************************************************************************* * ImageList_DrawIndirect [COMCTL32.@] * @@ -1141,17 +1200,12 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (fState & ILS_ALPHA) { - BLENDFUNCTION func; COLORREF colour; - func.BlendOp = AC_SRC_OVER; - func.BlendFlags = 0; - func.SourceConstantAlpha = pimldp->Frame; - func.AlphaFormat = AC_SRC_ALPHA; if (bIsTransparent) { - bResult = GdiAlphaBlend( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, - hImageListDC, pt.x, pt.y, cx, cy, func ); + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, pimldp->Frame ); goto end; } colour = pimldp->rgbBk; @@ -1160,7 +1214,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - GdiAlphaBlend( hImageDC, 0, 0, cx, cy, hImageListDC, pt.x, pt.y, cx, cy, func ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, pimldp->Frame ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end;

1 0

Michael Stefaniuc : oleaut32: Avoid using long.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 0f82f68734c7e7f1f783252845e3aab432ac1bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f82f68734c7e7f1f78325284… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 10 10:38:45 2010 +0200 oleaut32: Avoid using long. --- dlls/oleaut32/typelib.c | 20 ++++++++++---------- dlls/oleaut32/vartype.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5792cc5..7a56e93 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1519,7 +1519,7 @@ static inline unsigned int MSFT_Tell(const TLBContext *pcx) return pcx->pos; } -static inline void MSFT_Seek(TLBContext *pcx, long where) +static inline void MSFT_Seek(TLBContext *pcx, LONG where) { if (where != DO_NOT_SEEK) { @@ -1527,7 +1527,7 @@ static inline void MSFT_Seek(TLBContext *pcx, long where) if (where > pcx->length) { /* FIXME */ - ERR("seek beyond end (%ld/%d)\n", where, pcx->length ); + ERR("seek beyond end (%d/%d)\n", where, pcx->length ); TLB_abort(); } pcx->pos = where; @@ -1535,9 +1535,9 @@ static inline void MSFT_Seek(TLBContext *pcx, long where) } /* read function */ -static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) +static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, LONG where ) { - TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08lx\n", + TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08x\n", pcx->pos, count, pcx->oStart, pcx->length, where); MSFT_Seek(pcx, where); @@ -1548,7 +1548,7 @@ static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) } static DWORD MSFT_ReadLEDWords(void *buffer, DWORD count, TLBContext *pcx, - long where ) + LONG where ) { DWORD ret; @@ -1559,7 +1559,7 @@ static DWORD MSFT_ReadLEDWords(void *buffer, DWORD count, TLBContext *pcx, } static DWORD MSFT_ReadLEWords(void *buffer, DWORD count, TLBContext *pcx, - long where ) + LONG where ) { DWORD ret; @@ -2714,7 +2714,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath if(index_str && *++index_str != '\0') { LPWSTR end_ptr; - long idx = strtolW(index_str, &end_ptr, 10); + LONG idx = strtolW(index_str, &end_ptr, 10); if(*end_ptr == '\0') { int str_len = index_str - pszFileName - 1; @@ -2834,7 +2834,7 @@ static ITypeLibImpl* TypeLibImpl_Constructor(void) static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) { TLBContext cx; - long lPSegDir; + LONG lPSegDir; MSFT_Header tlbHeader; MSFT_SegDir tlbSegDir; ITypeLibImpl * pTypeLibImpl; @@ -2867,14 +2867,14 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) lPSegDir = sizeof(tlbHeader) + (tlbHeader.nrtypeinfos)*4 + ((tlbHeader.varflags & HELPDLLFLAG)? 4 :0); /* now read the segment directory */ - TRACE("read segment directory (at %ld)\n",lPSegDir); + TRACE("read segment directory (at %d)\n",lPSegDir); MSFT_ReadLEDWords(&tlbSegDir, sizeof(tlbSegDir), &cx, lPSegDir); cx.pTblDir = &tlbSegDir; /* just check two entries */ if ( tlbSegDir.pTypeInfoTab.res0c != 0x0F || tlbSegDir.pImpInfo.res0c != 0x0F) { - ERR("cannot find the table directory, ptr=0x%lx\n",lPSegDir); + ERR("cannot find the table directory, ptr=0x%x\n",lPSegDir); HeapFree(GetProcessHeap(),0,pTypeLibImpl); return NULL; } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 33f6f90..1aa71fb 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5368,7 +5368,7 @@ typedef union { struct { - unsigned long m : 23; + unsigned int m : 23; unsigned int exp_bias : 8; unsigned int sign : 1; } i; @@ -5427,7 +5427,7 @@ typedef union { struct { - unsigned long m_lo : 32; /* 52 bits of precision */ + unsigned int m_lo : 32; /* 52 bits of precision */ unsigned int m_hi : 20; unsigned int exp_bias : 11; /* bias == 1023 */ unsigned int sign : 1;

1 0

Stefan Dösinger : wined3d: Don' t use GL_ARB_map_buffer_range for now.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 481aca47ad649297e5435d0f4c7466fd70aa702f URL: http://source.winehq.org/git/wine.git/?a=commit;h=481aca47ad649297e5435d0f4… Author: Stefan Dösinger <stefan(a)e195-194.eduroam.tuwien.ac.at> Date: Wed May 5 13:02:07 2010 +0200 wined3d: Don't use GL_ARB_map_buffer_range for now. There are numerous problems with this extension, and there are no visible upsides. In the best case dynamic VBOs are just as fast as no VBO at all. --- dlls/wined3d/buffer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b56895b..8372b7a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1474,7 +1474,8 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); - dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; + /* GL_ARB_map_buffer_range is disabled for now due to numerous bugs and no gains */ + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others).

1 0

Gerald Pfeifer : oleaut32/tests: Remove variable changed which is not really used from test_SysReAllocStringLen .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: b98f916dae61ff2f99482797e1e6cb77d2de02bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98f916dae61ff2f99482797e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:31:09 2010 +0200 oleaut32/tests: Remove variable changed which is not really used from test_SysReAllocStringLen. --- dlls/oleaut32/tests/vartype.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 2ee5fea..c46ad8a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5444,9 +5444,7 @@ static void test_SysReAllocStringLen(void) ok(str != NULL, "Expected non-NULL\n"); if(str) { - int changed; - - changed = SysReAllocStringLen(&str, str, 1000000); + SysReAllocStringLen(&str, str, 1000000); ok(SysStringLen(str)==1000000, "Incorrect string length\n"); ok(!memcmp(szTest, str, 4*sizeof(WCHAR)), "Incorrect string returned\n");

1 0

Eric Pouech : dbghelp: Protect PE' s COFF table reading against bogus values in NTHEADER.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 516fc78a2b8afd57d5a1ad219c4886b3ea0d60f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516fc78a2b8afd57d5a1ad219… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 8 21:47:16 2010 +0200 dbghelp: Protect PE's COFF table reading against bogus values in NTHEADER. --- dlls/dbghelp/pe_module.c | 49 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index baddaeb..cd2f248 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -172,6 +172,25 @@ unsigned pe_get_map_size(const struct image_section_map* ism) } /****************************************************************** + * pe_is_valid_pointer_table + * + * Checks whether the PointerToSymbolTable and NumberOfSymbols in file_header contain + * valid information. + */ +static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping) +{ + DWORD64 offset; + + /* is the iSym table inside file image ? */ + offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable; + offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + if (offset > (DWORD64)nthdr->OptionalHeader.SizeOfImage) return FALSE; + /* is string table (following iSym table) inside file image ? */ + offset += *(DWORD*)((const char*)mapping + offset); + return offset <= (DWORD64)nthdr->OptionalHeader.SizeOfImage; +} + +/****************************************************************** * pe_map_file * * Maps an PE file into memory (and checks it's a real PE file) @@ -209,16 +228,26 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty } if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols) { - /* FIXME ugly: should rather map the relevant content instead of copying it */ - const char* src = (const char*)mapping + - nthdr->FileHeader.PointerToSymbolTable + - nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); - char* dst; - DWORD sz = *(DWORD*)src; - - if ((dst = HeapAlloc(GetProcessHeap(), 0, sz))) - memcpy(dst, src, sz); - fmap->u.pe.strtable = dst; + if (pe_is_valid_pointer_table(nthdr, mapping)) + { + /* FIXME ugly: should rather map the relevant content instead of copying it */ + const char* src = (const char*)mapping + + nthdr->FileHeader.PointerToSymbolTable + + nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + char* dst; + DWORD sz = *(DWORD*)src; + + if ((dst = HeapAlloc(GetProcessHeap(), 0, sz))) + memcpy(dst, src, sz); + fmap->u.pe.strtable = dst; + } + else + { + /* we have bad information here, wipe it out */ + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable = 0; + fmap->u.pe.ntheader.FileHeader.NumberOfSymbols = 0; + fmap->u.pe.strtable = NULL; + } } else fmap->u.pe.strtable = NULL; }

1 0

Mike Kaplinskiy : ws2_32: Improve SIO_GET_EXTENSION_FUNCTION_POINTER stub.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: df710826e17e9d49a3943cea9b82b168f5095b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df710826e17e9d49a3943cea9… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat May 8 15:10:58 2010 -0400 ws2_32: Improve SIO_GET_EXTENSION_FUNCTION_POINTER stub. --- dlls/ws2_32/socket.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e6a6973..63607fe 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2706,9 +2706,54 @@ INT WINAPI WSAIoctl(SOCKET s, break; case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(lpvInBuffer)); - WSASetLastError(WSAEOPNOTSUPP); - return SOCKET_ERROR; + { + static const GUID connectex_guid = WSAID_CONNECTEX; + static const GUID disconnectex_guid = WSAID_DISCONNECTEX; + static const GUID acceptex_guid = WSAID_ACCEPTEX; + static const GUID getaccepexsockaddrs_guid = WSAID_GETACCEPTEXSOCKADDRS; + static const GUID transmitfile_guid = WSAID_TRANSMITFILE; + static const GUID transmitpackets_guid = WSAID_TRANSMITPACKETS; + static const GUID wsarecvmsg_guid = WSAID_WSARECVMSG; + static const GUID wsasendmsg_guid = WSAID_WSASENDMSG; + + if ( IsEqualGUID(&connectex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented ConnectEx\n"); + } + else if ( IsEqualGUID(&disconnectex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented DisconnectEx\n"); + } + else if ( IsEqualGUID(&acceptex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented AcceptEx\n"); + } + else if ( IsEqualGUID(&getaccepexsockaddrs_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented GetAcceptExSockaddrs\n"); + } + else if ( IsEqualGUID(&transmitfile_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitFile\n"); + } + else if ( IsEqualGUID(&transmitpackets_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitPackets\n"); + } + else if ( IsEqualGUID(&wsarecvmsg_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented WSARecvMsg\n"); + } + else if ( IsEqualGUID(&wsasendmsg_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented WSASendMsg\n"); + } + else + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(lpvInBuffer)); + + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + } case WS_SIO_KEEPALIVE_VALS: {

1 0

Mike Kaplinskiy : include: Add WSAID_WSASENDMSG extension guid.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: db1f5d5f75500c44bc3d327afa4b6704daf987f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1f5d5f75500c44bc3d327af… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat May 8 15:23:33 2010 -0400 include: Add WSAID_WSASENDMSG extension guid. --- include/mswsock.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 398572b..5423438 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -118,7 +118,7 @@ extern "C" { #define WSAID_CONNECTEX \ {0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}} #define WSAID_DISCONNECTEX \ - {0x7fda2e11,0x8630,0x436f,{0xa0, 0x31, 0xf5, 0x36, 0xa6, 0xee, 0xc1, 0x57}} + {0x7fda2e11,0x8630,0x436f,{0xa0,0x31,0xf5,0x36,0xa6,0xee,0xc1,0x57}} #define WSAID_GETACCEPTEXSOCKADDRS \ {0xb5367df2,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}} #define WSAID_TRANSMITFILE \ @@ -127,6 +127,8 @@ extern "C" { {0xd9689da0,0x1f90,0x11d3,{0x99,0x71,0x00,0xc0,0x4f,0x68,0xc8,0x76}} #define WSAID_WSARECVMSG \ {0xf689d7c8,0x6f1f,0x436b,{0x8a,0x53,0xe5,0x4f,0xe3,0x51,0xc3,0x22}} +#define WSAID_WSASENDMSG \ + {0xa441e712,0x754f,0x43ca,{0x84,0xa7,0x0d,0xee,0x44,0xcf,0x60,0x6d}} typedef struct _TRANSMIT_FILE_BUFFERS { LPVOID Head; @@ -170,6 +172,7 @@ typedef VOID (WINAPI * LPFN_GETACCEPTEXSOCKADDRS)(PVOID, DWORD, DWORD, DWORD, st typedef BOOL (WINAPI * LPFN_TRANSMITFILE)(SOCKET, HANDLE, DWORD, DWORD, LPOVERLAPPED, LPTRANSMIT_FILE_BUFFERS, DWORD); typedef BOOL (WINAPI * LPFN_TRANSMITPACKETS)(SOCKET, LPTRANSMIT_PACKETS_ELEMENT, DWORD, DWORD, LPOVERLAPPED, DWORD); typedef INT (WINAPI * LPFN_WSARECVMSG)(SOCKET, LPWSAMSG, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); +typedef INT (WINAPI * LPFN_WSASENDMSG)(SOCKET, LPWSAMSG, DWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); BOOL WINAPI AcceptEx(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED); VOID WINAPI GetAcceptExSockaddrs(PVOID, DWORD, DWORD, DWORD, struct sockaddr **, LPINT, struct sockaddr **, LPINT);

1 0

Nikolay Sivov : user32: Fix selected brush color for caret bitmap creation.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: dcddea361f3cd2717c92757adddb87badc55d3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcddea361f3cd2717c92757ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 8 22:10:29 2010 +0400 user32: Fix selected brush color for caret bitmap creation. --- dlls/user32/caret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 953a081..308336d 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -154,7 +154,7 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) { HBITMAP hPrevBmp = SelectObject(hMemDC, hBmp); SetRect( &r, 0, 0, width, height ); - FillRect(hMemDC, &r, ULongToHandle((bitmap ? COLOR_GRAYTEXT : COLOR_WINDOW) + 1)); + FillRect(hMemDC, &r, bitmap ? GetStockObject(GRAY_BRUSH) : GetStockObject(WHITE_BRUSH)); SelectObject(hMemDC, hPrevBmp); } DeleteDC(hMemDC);

1 0

Alexandre Julliard : winex11: The startscan line is relative to the destination in SetDIBits.
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: 27c85646057fd4b1011f4e3c7101930a892accaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c85646057fd4b1011f4e3c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 12:35:47 2010 +0200 winex11: The startscan line is relative to the destination in SetDIBits. --- dlls/winex11.drv/dib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index d72ae00..95e3511 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4043,8 +4043,8 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start { unsigned int srcwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); int dstwidthb = ds.dsBm.bmWidthBytes; - LPBYTE dbits = physBitmap->base; - const BYTE *sbits = (const BYTE*)bits + (startscan * srcwidthb); + LPBYTE dbits = physBitmap->base + startscan * dstwidthb; + const BYTE *sbits = bits; int widthb; UINT y;

1 0

Alexandre Julliard : winex11: Select for EnterNotify events on the desktop window in order to update the cursor .
by Alexandre Julliard 10 May '10

10 May '10

Module: wine Branch: master Commit: f4be1662341111db5ca530124e28fc4b70dac2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4be1662341111db5ca530124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 12:34:17 2010 +0200 winex11: Select for EnterNotify events on the desktop window in order to update the cursor. --- dlls/winex11.drv/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a2bc004..4a36e46 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -142,7 +142,7 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) wine_tsx11_lock(); /* Create window */ - win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | + win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask; win_attr.cursor = XCreateFontCursor( display, XC_top_left_arrow );

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
96
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 2010