July 2010 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/monthcal: Prepare MCM_GETMONTHRANGE with GMR_VISIBLE for multiple calendars.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 94666ebf0de8097fa0850c0f78c105079e0faff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94666ebf0de8097fa0850c0f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 18 16:42:08 2010 +0400 comctl32/monthcal: Prepare MCM_GETMONTHRANGE with GMR_VISIBLE for multiple calendars. --- dlls/comctl32/monthcal.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index d2245c3..c5a7122 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -6,7 +6,7 @@ * Copyright 1999 Chris Morgan <cmorgan(a)wpi.edu> and * James Abbatiello <abbeyj(a)wpi.edu> * Copyright 2000 Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> - * Copyright 2009 Nikolay Sivov + * Copyright 2009, 2010 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1241,7 +1241,8 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) { /* Native behaviour for that case is broken: invalid date number >31 got displayed at (0,0) position, current month starts always from - (1,0) position. Should be implemnted here as well. */ + (1,0) position. Should be implemented here as well only if there's + nothing else to do. */ if (day < -1) FIXME("No bug compatibility for day=%d\n", day); @@ -1261,19 +1262,18 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) static LRESULT MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) { - TRACE("\n"); + TRACE("flag=%d, st=%p\n", flag, st); if(st) { switch (flag) { case GMR_VISIBLE: { - /*FIXME: currently multicalendar feature isn't implemented, so entirely - visible month is current */ - st[0] = st[1] = infoPtr->curSel; + st[0] = infoPtr->calendars[0].month; + st[1] = infoPtr->calendars[infoPtr->cal_num-1].month; - if (infoPtr->curSel.wMonth == min_allowed_date.wMonth && - infoPtr->curSel.wYear == min_allowed_date.wYear) + if (st[0].wMonth == min_allowed_date.wMonth && + st[0].wYear == min_allowed_date.wYear) { st[0].wDay = min_allowed_date.wDay; } @@ -1283,8 +1283,8 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); MONTHCAL_CalculateDayOfWeek(&st[1], TRUE); - /* a single current month used */ - return 1; + + return infoPtr->cal_num; } case GMR_DAYSTATE: {

1 0

Damjan Jovanovic : notepad: Substitute the page number in the footer.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 8b593e903f46ed287aec40960da97e33e221a1ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b593e903f46ed287aec40960… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Jul 16 16:54:12 2010 +0200 notepad: Substitute the page number in the footer. --- programs/notepad/dialog.c | 62 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 2 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index e19e4d6..ff5df75 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -717,11 +717,67 @@ static int notepad_print_header(HDC hdc, RECT *rc, BOOL dopage, BOOL header, int return 0; } +static WCHAR *expand_header_vars(WCHAR *pattern, int page) +{ + int length = 0; + int i; + BOOL inside = FALSE; + WCHAR *buffer = NULL; + + for (i = 0; pattern[i]; i++) + { + if (inside) + { + if (pattern[i] == '&') + length++; + else if (pattern[i] == 'p') + length += 11; + inside = FALSE; + } + else if (pattern[i] == '&') + inside = TRUE; + else + length++; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + if (buffer) + { + int j = 0; + inside = FALSE; + for (i = 0; pattern[i]; i++) + { + if (inside) + { + if (pattern[i] == '&') + buffer[j++] = '&'; + else if (pattern[i] == 'p') + { + static const WCHAR percent_dW[] = {'%','d',0}; + j += wnsprintfW(&buffer[j], 11, percent_dW, page); + } + inside = FALSE; + } + else if (pattern[i] == '&') + inside = TRUE; + else + buffer[j++] = pattern[i]; + } + buffer[j++] = 0; + } + return buffer; +} + static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTINFO tInfo) { int b, y; TEXTMETRICW tm; SIZE szMetrics; + WCHAR *footer_text = NULL; + + footer_text = expand_header_vars(Globals.szFooter, page); + if (footer_text == NULL) + return FALSE; if (dopage) { @@ -730,13 +786,14 @@ static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTI static const WCHAR failedW[] = { 'S','t','a','r','t','P','a','g','e',' ','f','a','i','l','e','d',0 }; static const WCHAR errorW[] = { 'P','r','i','n','t',' ','E','r','r','o','r',0 }; MessageBoxW(Globals.hMainWnd, failedW, errorW, MB_ICONEXCLAMATION); + HeapFree(GetProcessHeap(), 0, footer_text); return FALSE; } } GetTextMetricsW(hdc, &tm); y = rc->top + notepad_print_header(hdc, rc, dopage, TRUE, page, Globals.szFileName) * tm.tmHeight; - b = rc->bottom - 2 * notepad_print_header(hdc, rc, FALSE, FALSE, page, Globals.szFooter) * tm.tmHeight; + b = rc->bottom - 2 * notepad_print_header(hdc, rc, FALSE, FALSE, page, footer_text) * tm.tmHeight; do { INT m, n; @@ -804,11 +861,12 @@ static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTI } } while (tInfo->mptr < tInfo->mend && y < b); - notepad_print_header(hdc, rc, dopage, FALSE, page, Globals.szFooter); + notepad_print_header(hdc, rc, dopage, FALSE, page, footer_text); if (dopage) { EndPage(hdc); } + HeapFree(GetProcessHeap(), 0, footer_text); return TRUE; }

1 0

Rico Schüller : wined3d: Add GL_NV_point_sprite extension.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 894a150f69ffbd50324e878a2f6a2740fa358b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894a150f69ffbd50324e878a2… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jul 16 18:39:06 2010 +0200 wined3d: Add GL_NV_point_sprite extension. --- dlls/wined3d/context.c | 34 +++++++++++++++++++++++++++++----- dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 4 +++- dlls/wined3d/wined3d_gl.h | 16 ++++++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f21c805..8029f4f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1484,8 +1484,19 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 if (gl_info->supported[WINED3D_GL_VERSION_2_0]) { - glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT); - checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)"); + /* Windows doesn't support to query the glPointParameteri function pointer, so use the + * NV_POINT_SPRITE extension. + */ + if (glPointParameteri) + { + glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT); + checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)"); + } + else if (gl_info->supported[NV_POINT_SPRITE]) + { + GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)); + checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)"); + } } if (gl_info->supported[ARB_PROVOKING_VERTEX]) @@ -1943,12 +1954,25 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) static inline void context_set_render_offscreen(struct wined3d_context *context, const struct StateEntry *StateTable, BOOL offscreen) { + const struct wined3d_gl_info *gl_info = context->gl_info; + if (context->render_offscreen == offscreen) return; - if (context->gl_info->supported[WINED3D_GL_VERSION_2_0]) + if (gl_info->supported[WINED3D_GL_VERSION_2_0]) { - glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT); - checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); + /* Windows doesn't support to query the glPointParameteri function pointer, so use the + * NV_POINT_SPRITE extension. + */ + if (glPointParameteri) + { + glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT); + checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); + } + else if (gl_info->supported[NV_POINT_SPRITE]) + { + GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT)); + checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); + } } Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0c4e994..8c744ff 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -138,6 +138,7 @@ static const struct { {"GL_NV_fragment_program_option", NV_FRAGMENT_PROGRAM_OPTION, 0 }, {"GL_NV_half_float", NV_HALF_FLOAT, 0 }, {"GL_NV_light_max_exponent", NV_LIGHT_MAX_EXPONENT, 0 }, + {"GL_NV_point_sprite", NV_POINT_SPRITE, 0 }, {"GL_NV_register_combiners", NV_REGISTER_COMBINERS, 0 }, {"GL_NV_register_combiners2", NV_REGISTER_COMBINERS2, 0 }, {"GL_NV_texgen_reflection", NV_TEXGEN_REFLECTION, 0 }, diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 304ab23..650ddf6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -644,7 +644,9 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT } } - if (!context->gl_info->supported[WINED3D_GL_VERSION_2_0] && context->render_offscreen + if ((!context->gl_info->supported[WINED3D_GL_VERSION_2_0] + || (!glPointParameteri && !context->gl_info->supported[NV_POINT_SPRITE])) + && context->render_offscreen && This->stateBlock->renderState[WINED3DRS_POINTSPRITEENABLE] && This->stateBlock->gl_primitive_type == GL_POINTS) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b2dfddf..e069ae6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1818,6 +1818,7 @@ typedef enum wined3d_gl_extension NV_FRAGMENT_PROGRAM_OPTION, NV_HALF_FLOAT, NV_LIGHT_MAX_EXPONENT, + NV_POINT_SPRITE, NV_REGISTER_COMBINERS, NV_REGISTER_COMBINERS2, NV_TEXGEN_REFLECTION, @@ -3482,6 +3483,16 @@ typedef void (WINE_GLAPI *PGLFNVERTEXATTRIBS4HVNVPROC)(GLuint index, GLsizei n, #define GL_MAX_SPOT_EXPONENT_NV 0x8505 #endif +/* GL_NV_point_sprite */ +#ifndef GL_NV_point_sprite +#define GL_NV_point_sprite 1 +#define GL_NV_POINT_SPRITE_NV 0x8861 +#define GL_NV_COORD_REPLACE_NV 0x8862 +#define GL_NV_POINT_SPRITE_R_MODE_NV 0x8863 +#endif +typedef void (WINE_GLAPI *PGLFNPOINTPARAMETERIVNVPROC)(GLenum pname, const GLint *params); +typedef void (WINE_GLAPI *PGLFNPOINTPARAMETERINVPROC)(GLenum pname, GLint param); + /* GL_NV_register_combiners */ #ifndef GL_NV_register_combiners #define GL_NV_register_combiners 1 @@ -4477,6 +4488,11 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelForma glVertexAttribs3hvNV, NV_HALF_FLOAT, NULL) \ USE_GL_FUNC(PGLFNVERTEXATTRIBS4HVNVPROC, \ glVertexAttribs4hvNV, NV_HALF_FLOAT, NULL) \ + /* GL_NV_point_sprite */ \ + USE_GL_FUNC(PGLFNPOINTPARAMETERIVNVPROC, \ + glPointParameterivNV, NV_POINT_SPRITE, NULL) \ + USE_GL_FUNC(PGLFNPOINTPARAMETERINVPROC, \ + glPointParameteriNV, NV_POINT_SPRITE, NULL) \ /* GL_NV_register_combiners */ \ USE_GL_FUNC(PGLFNCOMBINERINPUTNVPROC, \ glCombinerInputNV, NV_REGISTER_COMBINERS, NULL) \

1 0

Florian Köberle : wined3d: Let GetRasterStatus return D3DERR_INVALIDCALL.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 2c1e8decfca4845569f871c29bc7d2adba285fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1e8decfca4845569f871c29… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Sun Jul 18 09:26:51 2010 +0200 wined3d: Let GetRasterStatus return D3DERR_INVALIDCALL. --- dlls/wined3d/swapchain_base.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain_base.c b/dlls/wined3d/swapchain_base.c index 1817de2..3520a41 100644 --- a/dlls/wined3d/swapchain_base.c +++ b/dlls/wined3d/swapchain_base.c @@ -123,15 +123,18 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetBackBuffer(IWineD3DSwapChain *iface, HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) { static BOOL warned; - pRasterStatus->InVBlank = TRUE; - pRasterStatus->ScanLine = 0; - /* No openGL equivalent */ + /* No OpenGL equivalent */ if (!warned) { FIXME("iface %p, raster_status %p stub!\n", iface, pRasterStatus); warned = TRUE; } - return WINED3D_OK; + /* Obtaining the raster status is a widely implemented but optional feature. + * When this method returns OK then the application Starcraft 2 expects that + * the pRasterStatus->InVBlank value differs over time. To prevent Starcraft 2 + * from running in an infinite loop at startup this method returns INVALIDCALL. + */ + return WINED3DERR_INVALIDCALL; } HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface, WINED3DDISPLAYMODE*pMode) {

1 0

Howell Tam : ws2_32: Wrapped WSASendTo/ WSARecvFrom with a different function name.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 8b7ec05bd20359662f4feb7ef68a283b464bd03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7ec05bd20359662f4feb7ef… Author: Howell Tam <pigeon(a)pigeond.net> Date: Sun Jul 18 10:53:06 2010 +1000 ws2_32: Wrapped WSASendTo/WSARecvFrom with a different function name. --- dlls/ws2_32/socket.c | 84 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 63 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4191f80..2fde6e6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -169,6 +169,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); + +/* + * The actual definition of WSASendTo/WSARecvFrom, wrapped in a different + * function name, so that internal calls from ws2_32 itself will not trigger + * programs like Garena, which hooks WSASendTo/WSARecvFrom calls. + */ +static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesSent, DWORD dwFlags, + const struct WS_sockaddr *to, int tolen, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ); + +static int WS2_recvfrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, + struct WS_sockaddr *lpFrom, + LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ); + /* critical section to protect some non-reentrant net function */ static CRITICAL_SECTION csWSgetXXXbyYYY; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -2922,7 +2940,7 @@ int WINAPI WS_recv(SOCKET s, char *buf, int len, int flags) wsabuf.len = len; wsabuf.buf = buf; - if ( WSARecvFrom(s, &wsabuf, 1, &n, &dwFlags, NULL, NULL, NULL, NULL) == SOCKET_ERROR ) + if ( WS2_recvfrom(s, &wsabuf, 1, &n, &dwFlags, NULL, NULL, NULL, NULL) == SOCKET_ERROR ) return SOCKET_ERROR; else return n; @@ -2940,7 +2958,7 @@ int WINAPI WS_recvfrom(SOCKET s, char *buf, INT len, int flags, wsabuf.len = len; wsabuf.buf = buf; - if ( WSARecvFrom(s, &wsabuf, 1, &n, &dwFlags, from, fromlen, NULL, NULL) == SOCKET_ERROR ) + if ( WS2_recvfrom(s, &wsabuf, 1, &n, &dwFlags, from, fromlen, NULL, NULL) == SOCKET_ERROR ) return SOCKET_ERROR; else return n; @@ -3127,7 +3145,7 @@ int WINAPI WS_send(SOCKET s, const char *buf, int len, int flags) wsabuf.len = len; wsabuf.buf = (char*) buf; - if ( WSASendTo( s, &wsabuf, 1, &n, flags, NULL, 0, NULL, NULL) == SOCKET_ERROR ) + if ( WS2_sendto( s, &wsabuf, 1, &n, flags, NULL, 0, NULL, NULL) == SOCKET_ERROR ) return SOCKET_ERROR; else return n; @@ -3141,7 +3159,7 @@ INT WINAPI WSASend( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - return WSASendTo( s, lpBuffers, dwBufferCount, lpNumberOfBytesSent, dwFlags, + return WS2_sendto( s, lpBuffers, dwBufferCount, lpNumberOfBytesSent, dwFlags, NULL, 0, lpOverlapped, lpCompletionRoutine ); } @@ -3154,14 +3172,11 @@ INT WINAPI WSASendDisconnect( SOCKET s, LPWSABUF lpBuffers ) } -/*********************************************************************** - * WSASendTo (WS2_32.74) - */ -INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, - LPDWORD lpNumberOfBytesSent, DWORD dwFlags, - const struct WS_sockaddr *to, int tolen, - LPWSAOVERLAPPED lpOverlapped, - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) +static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesSent, DWORD dwFlags, + const struct WS_sockaddr *to, int tolen, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { unsigned int i, options; int n, fd, err; @@ -3337,6 +3352,21 @@ error: } /*********************************************************************** + * WSASendTo (WS2_32.74) + */ +INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesSent, DWORD dwFlags, + const struct WS_sockaddr *to, int tolen, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) +{ + return WS2_sendto( s, lpBuffers, dwBufferCount, + lpNumberOfBytesSent, dwFlags, + to, tolen, + lpOverlapped, lpCompletionRoutine ); +} + +/*********************************************************************** * sendto (WS2_32.20) */ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, @@ -3348,7 +3378,7 @@ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, wsabuf.len = len; wsabuf.buf = (char*) buf; - if ( WSASendTo(s, &wsabuf, 1, &n, flags, to, tolen, NULL, NULL) == SOCKET_ERROR ) + if ( WS2_sendto(s, &wsabuf, 1, &n, flags, to, tolen, NULL, NULL) == SOCKET_ERROR ) return SOCKET_ERROR; else return n; @@ -4932,17 +4962,14 @@ int WINAPI WSARecv(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - return WSARecvFrom(s, lpBuffers, dwBufferCount, NumberOfBytesReceived, lpFlags, + return WS2_recvfrom(s, lpBuffers, dwBufferCount, NumberOfBytesReceived, lpFlags, NULL, NULL, lpOverlapped, lpCompletionRoutine); } -/*********************************************************************** - * WSARecvFrom (WS2_32.69) - */ -INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, - LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom, - LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) +static int WS2_recvfrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom, + LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { unsigned int i, options; @@ -5096,6 +5123,21 @@ error: } /*********************************************************************** + * WSARecvFrom (WS2_32.69) + */ +INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom, + LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) + +{ + return WS2_recvfrom( s, lpBuffers, dwBufferCount, + lpNumberOfBytesRecvd, lpFlags, + lpFrom, lpFromlen, + lpOverlapped, lpCompletionRoutine ); +} + +/*********************************************************************** * WSCInstallProvider (WS2_32.88) */ INT WINAPI WSCInstallProvider( const LPGUID lpProviderId,

1 0

Nikolay Sivov : comctl32/monthcal: Separate single calendar data.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 274d132b1f9add943f97c6402c261730288795e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274d132b1f9add943f97c6402… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 18 16:12:41 2010 +0400 comctl32/monthcal: Separate single calendar data. --- dlls/comctl32/monthcal.c | 119 +++++++++++++++++++++++++++------------------- 1 files changed, 70 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=274d132b1f9add943f97c…

1 0

David Hedberg : comctl32: Add support for expanded state image in treeview.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: e81d65f8d45abf2dc304d4f841a09537395a57f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81d65f8d45abf2dc304d4f84… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 17:11:37 2010 +0200 comctl32: Add support for expanded state image in treeview. --- dlls/comctl32/treeview.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 860731e..9c95962 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -76,6 +76,7 @@ typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ int cchTextMax; int iImage; int iSelectedImage; + int iExpandedImage; int cChildren; LPARAM lParam; int iIntegral; /* item height multiplier (1 is normal) */ @@ -248,6 +249,10 @@ static inline BOOL item_changed (const TREEVIEW_ITEM *tiOld, const TREEVIEW_ITEM tiNew->iSelectedImage != I_IMAGECALLBACK) return TRUE; + if ((tvChange->mask & TVIF_EXPANDEDIMAGE) && (tiOld->iExpandedImage != tiNew->iExpandedImage) && + tiNew->iExpandedImage != I_IMAGECALLBACK) + return TRUE; + /* Text has changed and it's not a callback */ if ((tvChange->mask & TVIF_TEXT) && (tiOld->pszText != tiNew->pszText) && tiNew->pszText != LPSTR_TEXTCALLBACKW) @@ -801,6 +806,9 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if (mask & TVIF_SELECTEDIMAGE) wineItem->iSelectedImage = callback.item.iSelectedImage; + if (mask & TVIF_EXPANDEDIMAGE) + wineItem->iExpandedImage = callback.item.iExpandedImage; + if (mask & TVIF_CHILDREN) wineItem->cChildren = callback.item.cChildren; @@ -997,6 +1005,7 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) * inc/dec to toggle the images. */ newItem->iImage = 0; newItem->iSelectedImage = 0; + newItem->iExpandedImage = 0; if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { @@ -1173,6 +1182,16 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, callbackClear |= TVIF_SELECTEDIMAGE; } + if (tvItem->mask & TVIF_EXPANDEDIMAGE) + { + wineItem->iExpandedImage = tvItem->iExpandedImage; + + if (wineItem->iExpandedImage == I_IMAGECALLBACK) + callbackSet |= TVIF_EXPANDEDIMAGE; + else + callbackClear |= TVIF_EXPANDEDIMAGE; + } + if (tvItem->mask & TVIF_PARAM) wineItem->lParam = tvItem->lParam; @@ -2076,6 +2095,9 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW) if (tvItem->mask & TVIF_SELECTEDIMAGE) tvItem->iSelectedImage = wineItem->iSelectedImage; + if (tvItem->mask & TVIF_EXPANDEDIMAGE) + tvItem->iExpandedImage = wineItem->iExpandedImage; + if (tvItem->mask & TVIF_STATE) /* Careful here - Windows ignores the stateMask when you get the state That contradicts the documentation, but makes more common sense, masking @@ -2539,8 +2561,8 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem ILD_NORMAL); } - /* Now, draw the normal image; can be either selected or - * non-selected image. + /* Now, draw the normal image; can be either selected, + * non-selected or expanded image. */ if ((wineItem->state & TVIS_SELECTED) && (wineItem->iSelectedImage >= 0)) @@ -2548,9 +2570,14 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem /* The item is currently selected */ imageIndex = wineItem->iSelectedImage; } + else if ((wineItem->state & TVIS_EXPANDED) && (wineItem->iExpandedImage >= 0)) + { + /* The item is currently not selected but expanded */ + imageIndex = wineItem->iExpandedImage; + } else { - /* The item is not selected */ + /* The item is not selected and not expanded */ imageIndex = wineItem->iImage; }

1 0

David Hedberg : comctl32: Warn when using unsupported extended styles.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: b30934c5296a59a54a7cffa75908f85df07ff6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30934c5296a59a54a7cffa75… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 17:11:38 2010 +0200 comctl32: Warn when using unsupported extended styles. --- dlls/comctl32/treeview.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 9c95962..b49bbcd 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1208,6 +1208,11 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, wineItem->state |= (tvItem->state & tvItem->stateMask); } + if (tvItem->mask & TVIF_STATEEX) + { + FIXME("New extended state: %x\n", tvItem->uStateEx); + } + wineItem->callbackMask |= callbackSet; wineItem->callbackMask &= ~callbackClear;

1 0

David Hedberg : include: Add some missing function declarations in shlwapi. h.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: a93f54bb56e4ce00da703ed4e6a46199cc190a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93f54bb56e4ce00da703ed4e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 17:16:59 2010 +0200 include: Add some missing function declarations in shlwapi.h. --- include/shlwapi.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index e17789b..744be84 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -319,6 +319,12 @@ BOOL WINAPI AssocIsDangerous(LPCWSTR); #endif /* NO_SHLWAPI_REG */ +void WINAPI IUnknown_Set(IUnknown **ppunk, IUnknown *punk); +void WINAPI IUnknown_AtomicRelease(IUnknown **punk); +HRESULT WINAPI IUnknown_GetWindow(IUnknown *punk, HWND *phwnd); +HRESULT WINAPI IUnknown_SetSite(IUnknown *punk, IUnknown *punkSite); +HRESULT WINAPI IUnknown_GetSite(IUnknown *punk, REFIID riid, void **ppv); +HRESULT WINAPI IUnknown_QueryService(IUnknown *punk, REFGUID guidService, REFIID riid, void **ppvOut); /* Path functions */ #ifndef NO_SHLWAPI_PATH

1 0

Matteo Bruni : d3dx9: Remove unused parameter from get_regname().
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: a5e55c157faf95b6b0564c8c59313ab4b662fa29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e55c157faf95b6b0564c8c5… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jul 17 21:57:38 2010 +0200 d3dx9: Remove unused parameter from get_regname(). --- dlls/d3dx9_36/asmparser.c | 29 ++++++++++++++--------------- dlls/d3dx9_36/asmutils.c | 18 +++++++++--------- dlls/d3dx9_36/d3dx9_36_private.h | 4 ++-- 3 files changed, 25 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5e55c157faf95b6b0564…

1 0