wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Nikolay Sivov : comctl32/monthcal: Prepare drawing helpers for multiple calendars.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 2042cbc2431061126ffed311ec61572188253a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2042cbc2431061126ffed311e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 18 16:13:44 2010 +0400 comctl32/monthcal: Prepare drawing helpers for multiple calendars. --- dlls/comctl32/monthcal.c | 236 ++++++++++++++++++++++++++-------------------- 1 files changed, 133 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2042cbc2431061126ffed…

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

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

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

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

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

Matteo Bruni : d3dx9: Check dcl input instruction syntax against shader version.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: c2b0f200fa576674cad3e443c41d0b977448fcdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b0f200fa576674cad3e443c… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jul 17 21:57:38 2010 +0200 d3dx9: Check dcl input instruction syntax against shader version. --- dlls/d3dx9_36/asmparser.c | 5 ----- dlls/d3dx9_36/asmshader.y | 22 ++++++++++++++++++++++ dlls/d3dx9_36/tests/asm.c | 12 ++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index b04325c..e9d0ea0 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -152,11 +152,6 @@ static void asmparser_dcl_input_ps_2(struct asm_parser *This, DWORD usage, DWORD struct instruction instr; if(!This->shader) return; - if(usage != 0) { - asmparser_message(This, "Line %u: Unsupported usage in dcl instruction\n", This->line_no); - set_parse_status(This, PARSE_ERR); - return; - } instr.dstmod = mod; instr.shift = 0; This->funcs->dstreg(This, &instr, reg); diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 689a8fd..501354d 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -549,6 +549,12 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_ERR); } + if(asm_ctx.shader->version == BWRITERPS_VERSION(2, 0) || + asm_ctx.shader->version == BWRITERPS_VERSION(2, 1)) { + asmparser_message(&asm_ctx, "Line %u: Declaration not supported in PS 2\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } ZeroMemory(&reg, sizeof(reg)); reg.type = $4.type; reg.regnum = $4.regnum; @@ -566,6 +572,12 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_ERR); } + if(asm_ctx.shader->version == BWRITERPS_VERSION(2, 0) || + asm_ctx.shader->version == BWRITERPS_VERSION(2, 1)) { + asmparser_message(&asm_ctx, "Line %u: Declaration not supported in PS 2\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } ZeroMemory(&reg, sizeof(reg)); reg.type = $4.type; reg.regnum = $4.regnum; @@ -583,6 +595,11 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_ERR); } + if(asm_ctx.shader->type != ST_PIXEL) { + asmparser_message(&asm_ctx, "Line %u: Declaration needs a semantic\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } ZeroMemory(&reg, sizeof(reg)); reg.type = $3.type; reg.regnum = $3.regnum; @@ -600,6 +617,11 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_ERR); } + if(asm_ctx.shader->type != ST_PIXEL) { + asmparser_message(&asm_ctx, "Line %u: Declaration needs a semantic\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } ZeroMemory(&reg, sizeof(reg)); reg.type = $3.type; reg.regnum = $3.regnum; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 23ec484..0b8b777 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1377,6 +1377,18 @@ static void failure_test(void) { /* shader 47: no samplers in vs_2_0 */ "vs_2_0\n" "dcl_2d s2\n", + /* shader 48: semantic required in vs dcl input instruction */ + "vs_2_0\n" + "dcl v0\n", + /* shader 49: semantic not allowed in ps dcl input instruction*/ + "ps_2_0\n" + "dcl_position0 v0\n", + /* shader 50: dcl instruction not in ps_1_x */ + "ps_1_4\n" + "dcl_position0 v0\n", + /* shader 51: no dcl output instruction in < vs 3.0 */ + "vs_2_0\n" + "dcl_positiont0 o0\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Error out on dcl output instruction where not supported.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 0ea6f7957aeca41d238b7f28c1ee8f1039222918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea6f7957aeca41d238b7f28c… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jul 17 21:57:38 2010 +0200 d3dx9: Error out on dcl output instruction where not supported. --- dlls/d3dx9_36/asmparser.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index f00a12c..b04325c 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -116,6 +116,12 @@ static void asmparser_dcl_output(struct asm_parser *This, DWORD usage, DWORD num } } +static void asmparser_dcl_output_unsupported(struct asm_parser *This, DWORD usage, DWORD num, + const struct shader_reg *reg) { + asmparser_message(This, "Line %u: Output declaration unsupported in this shader version\n", This->line_no); + set_parse_status(This, PARSE_ERR); +} + static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, DWORD mod, const struct shader_reg *reg) { struct instruction instr; @@ -783,7 +789,7 @@ static const struct asmparser_backend parser_vs_1 = { asmparser_predicate_unsupported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input, asmparser_dcl_sampler_unsupported, @@ -803,7 +809,7 @@ static const struct asmparser_backend parser_vs_2 = { asmparser_predicate_supported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input, asmparser_dcl_sampler_unsupported, @@ -843,7 +849,7 @@ static const struct asmparser_backend parser_ps_2 = { asmparser_predicate_unsupported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input_ps_2, asmparser_dcl_sampler, @@ -863,7 +869,7 @@ static const struct asmparser_backend parser_ps_2_x = { asmparser_predicate_supported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input_ps_2, asmparser_dcl_sampler, @@ -883,7 +889,7 @@ static const struct asmparser_backend parser_ps_3 = { asmparser_predicate_supported, asmparser_coissue_unsupported, - asmparser_dcl_output, + asmparser_dcl_output_unsupported, asmparser_dcl_input, asmparser_dcl_sampler,

1 0

Matteo Bruni : d3dx9: Improve a FIXME.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: d76e3ac9c6ab25c9270b79e71cc392daec1826ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76e3ac9c6ab25c9270b79e71… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jul 17 21:57:38 2010 +0200 d3dx9: Improve a FIXME. --- dlls/d3dx9_36/bytecodewriter.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index b444365..9fe2bfc 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -1825,7 +1825,8 @@ static HRESULT call_instr_handler(struct bc_writer *writer, i++; } - FIXME("Unhandled instruction %u\n", instr->opcode); + FIXME("Unhandled instruction %u - %s\n", instr->opcode, + debug_print_opcode(instr->opcode)); return E_INVALIDARG; }

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

← Newer
1
...
57
58
59
60
61
62
63
...
90
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 July 2010