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

Stefan Dösinger : wined3d: Pass the render target height as UINT.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 560c63d64e0d02f00bc448a37fd2c52b4546a58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=560c63d64e0d02f00bc448a37… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 20:12:41 2011 +0200 wined3d: Pass the render target height as UINT. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7f86ba5..6f87f0b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -528,7 +528,7 @@ static void shader_arb_load_np2fixup_constants(void *shader_priv, /* GL locking is done by the caller. */ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *gl_shader, - const struct wined3d_context *context, const struct wined3d_state *state, float rt_height) + const struct wined3d_context *context, const struct wined3d_state *state, UINT rt_height) { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned char i; @@ -564,7 +564,7 @@ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *g * ycorrection.w: 0.0 */ float val[4]; - val[0] = context->render_offscreen ? 0.0f : rt_height; + val[0] = context->render_offscreen ? 0.0f : (float) rt_height; val[1] = context->render_offscreen ? 1.0f : -1.0f; val[2] = 1.0f; val[3] = 0.0f; @@ -649,7 +649,7 @@ static void shader_arb_load_constants(const struct wined3d_context *context, cha { struct wined3d_shader *pshader = stateBlock->state.pixel_shader; const struct arb_ps_compiled_shader *gl_shader = priv->compiled_fprog; - float rt_height = device->render_targets[0]->resource.height; + UINT rt_height = device->render_targets[0]->resource.height; /* Load DirectX 9 float constants for pixel shader */ device->highest_dirty_ps_const = shader_arb_load_constantsF(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, @@ -4627,7 +4627,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, } else { - float rt_height = This->render_targets[0]->resource.height; + UINT rt_height = This->render_targets[0]->resource.height; shader_arb_ps_local_constants(compiled, context, state, rt_height); }

1 0

Jacek Caban : wininet: Fixed handling of 204 No Content response.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: a890e3a1442f14a1c1068406f97e2d6200c1eefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a890e3a1442f14a1c1068406f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:48:15 2011 +0200 wininet: Fixed handling of 204 No Content response. --- dlls/wininet/http.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 08bdd5a..19c7e76 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2568,12 +2568,17 @@ static const data_stream_vtbl_t chunked_stream_vtbl = { }; /* set the request content length based on the headers */ -static DWORD set_content_length(http_request_t *request) +static DWORD set_content_length(http_request_t *request, DWORD status_code) { static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; WCHAR encoding[20]; DWORD size; + if(status_code == HTTP_STATUS_NO_CONTENT) { + request->contentLength = request->netconn_stream.content_length = 0; + return ERROR_SUCCESS; + } + size = sizeof(request->contentLength); if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, &request->contentLength, &size, NULL) != ERROR_SUCCESS) @@ -4685,17 +4690,17 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTP_ProcessExpires(request); HTTP_ProcessLastModified(request); - res = set_content_length(request); - if(res != ERROR_SUCCESS) - goto lend; - if(!request->contentLength) - http_release_netconn(request, TRUE); - dwBufferSize = sizeof(dwStatusCode); if (HTTP_HttpQueryInfoW(request,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, &dwStatusCode,&dwBufferSize,NULL) != ERROR_SUCCESS) dwStatusCode = 0; + res = set_content_length(request, dwStatusCode); + if(res != ERROR_SUCCESS) + goto lend; + if(!request->contentLength) + http_release_netconn(request, TRUE); + if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && responseLen) { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; @@ -4795,7 +4800,7 @@ lend: if (request->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - if (res == ERROR_SUCCESS && request->bytesWritten == request->bytesToWrite) + if (res == ERROR_SUCCESS && request->contentLength && request->bytesWritten == request->bytesToWrite) HTTP_ReceiveRequestData(request, TRUE); else { @@ -4835,6 +4840,7 @@ static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_PTR dwContext) { INT responseLen; + DWORD dwCode, dwCodeLength; DWORD dwBufferSize; DWORD res = ERROR_SUCCESS; @@ -4854,19 +4860,22 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ HTTP_ProcessExpires(request); HTTP_ProcessLastModified(request); - if ((res = set_content_length( request )) == ERROR_SUCCESS) { + dwCodeLength = sizeof(dwCode); + if (HTTP_HttpQueryInfoW(request,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, + &dwCode,&dwCodeLength,NULL) != ERROR_SUCCESS) + dwCode = 0; + + if ((res = set_content_length( request, dwCode )) == ERROR_SUCCESS) { if(!request->contentLength) http_release_netconn(request, TRUE); } if (res == ERROR_SUCCESS && !(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) { - DWORD dwCode,dwCodeLength = sizeof(DWORD); - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, &dwCode, &dwCodeLength, NULL) == ERROR_SUCCESS - && (dwCode == HTTP_STATUS_REDIRECT || + if (dwCode == HTTP_STATUS_REDIRECT || dwCode == HTTP_STATUS_MOVED || dwCode == HTTP_STATUS_REDIRECT_METHOD || - dwCode == HTTP_STATUS_REDIRECT_KEEP_VERB)) + dwCode == HTTP_STATUS_REDIRECT_KEEP_VERB) { WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); @@ -4891,7 +4900,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ } } - if (res == ERROR_SUCCESS) { + if (res == ERROR_SUCCESS && request->contentLength) { HTTP_ReceiveRequestData(request, TRUE); }else { INTERNET_ASYNC_RESULT iar = {0, res};

1 0

Jacek Caban : wininet: Don't depend on is_end_of_read_data in HTTPREQ_Read.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 086eb61c846aa591ba5186a173dfea2b7f87159a URL: http://source.winehq.org/git/wine.git/?a=commit;h=086eb61c846aa591ba5186a17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 13:48:00 2011 +0200 wininet: Don't depend on is_end_of_read_data in HTTPREQ_Read. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bbf86cd..08bdd5a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2681,8 +2681,8 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * WARN("WriteFile failed: %u\n", GetLastError()); } - if(end_of_read_data(req)) - http_release_netconn(req, TRUE); + if(size && !ret_read) + http_release_netconn(req, res == ERROR_SUCCESS); return res; }

1 0

Stefan Dösinger : wined3d: Separate two unrelated variables.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: c2aab4258a476512a62cd824a30f262d76994709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2aab4258a476512a62cd824a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 20:24:51 2011 +0200 wined3d: Separate two unrelated variables. --- dlls/wined3d/arb_program_shader.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6f87f0b..c987674 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3521,7 +3521,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, const local_constant *lconst; GLuint retval; char fragcolor[16]; - DWORD *lconst_map = local_const_mapping(shader), next_local, cur; + DWORD *lconst_map = local_const_mapping(shader), next_local; struct shader_arb_ctx_priv priv_ctx; BOOL dcl_td = FALSE; BOOL want_nv_prog = FALSE; @@ -3684,13 +3684,15 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) { + unsigned char bump_const; + if (!(map & 1)) continue; - cur = compiled->numbumpenvmatconsts; - compiled->bumpenvmatconst[cur].const_num = WINED3D_CONST_NUM_UNUSED; - compiled->bumpenvmatconst[cur].texunit = i; - compiled->luminanceconst[cur].const_num = WINED3D_CONST_NUM_UNUSED; - compiled->luminanceconst[cur].texunit = i; + bump_const = compiled->numbumpenvmatconsts; + compiled->bumpenvmatconst[bump_const].const_num = WINED3D_CONST_NUM_UNUSED; + compiled->bumpenvmatconst[bump_const].texunit = i; + compiled->luminanceconst[bump_const].const_num = WINED3D_CONST_NUM_UNUSED; + compiled->luminanceconst[bump_const].texunit = i; /* We can fit the constants into the constant limit for sure because texbem, texbeml, bem and beml are only supported * in 1.x shaders, and GL_ARB_fragment_program has a constant limit of 24 constants. So in the worst case we're loading @@ -3701,16 +3703,16 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, * shaders in newer shader models. Since the bump env parameters have to share their space with NP2 fixup constants, * their location is shader dependent anyway and they cannot be loaded globally. */ - compiled->bumpenvmatconst[cur].const_num = next_local++; + compiled->bumpenvmatconst[bump_const].const_num = next_local++; shader_addline(buffer, "PARAM bumpenvmat%d = program.local[%d];\n", - i, compiled->bumpenvmatconst[cur].const_num); - compiled->numbumpenvmatconsts = cur + 1; + i, compiled->bumpenvmatconst[bump_const].const_num); + compiled->numbumpenvmatconsts = bump_const + 1; if (!(reg_maps->luminanceparams & (1 << i))) continue; - compiled->luminanceconst[cur].const_num = next_local++; + compiled->luminanceconst[bump_const].const_num = next_local++; shader_addline(buffer, "PARAM luminance%d = program.local[%d];\n", - i, compiled->luminanceconst[cur].const_num); + i, compiled->luminanceconst[bump_const].const_num); } for(i = 0; i < MAX_CONST_I; i++) @@ -3763,6 +3765,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, * applied / activated. This will probably result in wrong rendering of the texture, but will save us from * shader compilation errors and the subsequent errors when drawing with this shader. */ if (priv_ctx.cur_ps_args->super.np2_fixup) { + unsigned char cur_fixup_sampler = 0; struct arb_ps_np2fixup_info* const fixup = priv_ctx.cur_np2fixup_info; const WORD map = priv_ctx.cur_ps_args->super.np2_fixup; @@ -3771,13 +3774,12 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, fixup->offset = next_local; fixup->super.active = 0; - cur = 0; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { if (!(map & (1 << i))) continue; - if (fixup->offset + (cur >> 1) < max_lconsts) { + if (fixup->offset + (cur_fixup_sampler >> 1) < max_lconsts) { fixup->super.active |= (1 << i); - fixup->super.idx[i] = cur++; + fixup->super.idx[i] = cur_fixup_sampler++; } else { FIXME("No free constant found to load NP2 fixup data into shader. " "Sampling from this texture will probably look wrong.\n"); @@ -3785,7 +3787,7 @@ static GLuint shader_arb_generate_pshader(struct wined3d_shader *shader, } } - fixup->super.num_consts = (cur + 1) >> 1; + fixup->super.num_consts = (cur_fixup_sampler + 1) >> 1; if (fixup->super.num_consts) { shader_addline(buffer, "PARAM np2fixup[%u] = { program.env[%u..%u] };\n", fixup->super.num_consts, fixup->offset, fixup->super.num_consts + fixup->offset - 1);

1 0

Stefan Dösinger : wined3d: Fix a few MSVC data loss warnings.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: a549b8f09084ec198573222ebc1d2390b88fd197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a549b8f09084ec198573222eb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 18:05:27 2011 +0200 wined3d: Fix a few MSVC data loss warnings. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/gl_compat.c | 12 ++++++------ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index cbfd938..5915ea1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -274,7 +274,7 @@ static void drawStridedSlow(IWineD3DDeviceImpl *device, const struct wined3d_con if (specular_fog) { DWORD specularColor = *(const DWORD *)ptrToCoords; - GL_EXTCALL(glFogCoordfEXT(specularColor >> 24)); + GL_EXTCALL(glFogCoordfEXT((float) (specularColor >> 24))); } } diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 0f8eaba..5756445 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -178,9 +178,9 @@ static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { } } else { if(pname == GL_FOG_START) { - ctx->fogstart = param; + ctx->fogstart = (float) param; } else if(pname == GL_FOG_END) { - ctx->fogend = param; + ctx->fogend = (float) param; } old_fogcoord_glFogi(pname, param); } @@ -199,9 +199,9 @@ static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { } } else { if(pname == GL_FOG_START) { - ctx->fogstart = *param; + ctx->fogstart = (float) *param; } else if(pname == GL_FOG_END) { - ctx->fogend = *param; + ctx->fogend = (float) *param; } old_fogcoord_glFogiv(pname, param); } @@ -331,13 +331,13 @@ static void WINE_GLAPI wine_glFogCoordfEXT(GLfloat f) { ctx->fog_coord_value = f; } static void WINE_GLAPI wine_glFogCoorddEXT(GLdouble f) { - wine_glFogCoordfEXT(f); + wine_glFogCoordfEXT((GLfloat) f); } static void WINE_GLAPI wine_glFogCoordfvEXT(const GLfloat *f) { wine_glFogCoordfEXT(*f); } static void WINE_GLAPI wine_glFogCoorddvEXT(const GLdouble *f) { - wine_glFogCoordfEXT(*f); + wine_glFogCoordfEXT((GLfloat) *f); } /* End GL_EXT_fog_coord emulation */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1049a3..41e1e62 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -829,7 +829,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, correction_params[1] = 1.0f; } else { /* position is window relative, not viewport relative */ - correction_params[0] = context->current_rt->resource.height; + correction_params[0] = (float) context->current_rt->resource.height; correction_params[1] = -1.0f; } GL_EXTCALL(glUniform4fvARB(prog->ycorrection_location, 1, correction_params)); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 05e4631..d03a5e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2554,7 +2554,7 @@ HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) static inline unsigned short float_32_to_16(const float *in) { int exp = 0; - float tmp = fabs(*in); + float tmp = fabsf(*in); unsigned int mantissa; unsigned short ret;

1 0

Stefan Dösinger : wined3d: Fix a unsigned unary minus warning in MSVC.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 31901155ce7ecc29e3257627b7ec24641194953c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31901155ce7ecc29e3257627b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 17:47:29 2011 +0200 wined3d: Fix a unsigned unary minus warning in MSVC. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 44c1670..05e4631 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -399,7 +399,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); /* TODO: Is there a nicer way to force a specific alignment? (8 byte for ddraw) */ b_info->bmiHeader.biWidth = wined3d_surface_get_pitch(surface) / format->byte_count; - b_info->bmiHeader.biHeight = -surface->resource.height - extraline; + b_info->bmiHeader.biHeight = 0 - surface->resource.height - extraline; b_info->bmiHeader.biSizeImage = (surface->resource.height + extraline) * wined3d_surface_get_pitch(surface); b_info->bmiHeader.biPlanes = 1;

1 0

Alexandre Julliard : winex11: Don' t use raw events for button events so that we get the right coordinates.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: fd4ad5a60433b8314dce684b9d52f43769cd5867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4ad5a60433b8314dce684b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 12:40:19 2011 +0200 winex11: Don't use raw events for button events so that we get the right coordinates. --- dlls/winex11.drv/mouse.c | 74 +++++++--------------------------------------- 1 files changed, 11 insertions(+), 63 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5fd7338..6c56b15 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -290,9 +290,6 @@ static void enable_xinput2(void) mask.mask = mask_bits; mask.mask_len = sizeof(mask_bits); memset( mask_bits, 0, sizeof(mask_bits) ); - - XISetMask( mask_bits, XI_RawButtonPress ); - XISetMask( mask_bits, XI_RawButtonRelease ); XISetMask( mask_bits, XI_RawMotion ); for (i = 0; i < count; ++i) @@ -542,11 +539,20 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU input->type = INPUT_MOUSE; - if (!hwnd && window == x11drv_thread_data()->clip_window) + if (!hwnd) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if (!thread_data->clip_hwnd) return; + if (thread_data->clip_window != window) return; input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; - if (x11drv_thread_data()->xi2_state != xi_enabled) __wine_send_input( hwnd, input ); + if (!(input->u.mi.dwFlags & ~(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE))) + { + /* motion events are ignored when xinput2 is active */ + if (thread_data->xi2_state == xi_enabled) return; + } + __wine_send_input( hwnd, input ); return; } @@ -1391,56 +1397,6 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** - * X11DRV_RawButtonPress - */ -static void X11DRV_RawButtonPress( XIRawEvent *event ) -{ - int button = event->detail - 1; - INPUT input; - - if (button >= NB_BUTTONS) return; - - TRACE( "button %u\n", button ); - - input.type = INPUT_MOUSE; - input.u.mi.dx = 0; - input.u.mi.dy = 0; - input.u.mi.mouseData = button_down_data[button]; - input.u.mi.dwFlags = button_down_flags[button]; - input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); - input.u.mi.dwExtraInfo = 0; - - update_user_time( event->time ); - input.type = INPUT_MOUSE; - __wine_send_input( 0, &input ); -} - - -/*********************************************************************** - * X11DRV_RawButtonRelease - */ -static void X11DRV_RawButtonRelease( XIRawEvent *event ) -{ - int button = event->detail - 1; - INPUT input; - - if (button >= NB_BUTTONS) return; - - TRACE( "button %u\n", button ); - - input.u.mi.dx = 0; - input.u.mi.dy = 0; - input.u.mi.mouseData = button_up_data[button]; - input.u.mi.dwFlags = button_up_flags[button]; - input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); - input.u.mi.dwExtraInfo = 0; - - input.type = INPUT_MOUSE; - __wine_send_input( 0, &input ); -} - - -/*********************************************************************** * X11DRV_RawMotion */ static void X11DRV_RawMotion( XIRawEvent *event ) @@ -1518,14 +1474,6 @@ void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) switch (event->evtype) { - case XI_RawButtonPress: - X11DRV_RawButtonPress( event->data ); - break; - - case XI_RawButtonRelease: - X11DRV_RawButtonRelease( event->data ); - break; - case XI_RawMotion: X11DRV_RawMotion( event->data ); break;

1 0

Jörg Höhle : include: Define DRV_MCI_FIRST.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 2e177cb24962f61343aff98eb79eccb9d8237e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e177cb24962f61343aff98eb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 15 21:18:47 2010 +0100 include: Define DRV_MCI_FIRST. --- include/mmsystem.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/mmsystem.h b/include/mmsystem.h index 4631762..ef74c75 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -200,6 +200,8 @@ typedef struct mmtime_tag { #define DRV_POWER 0x000F #define DRV_RESERVED 0x0800 +#define DRV_MCI_FIRST DRV_RESERVED +#define DRV_MCI_LAST (0xFFF + DRV_MCI_FIRST) #define DRV_USER 0x4000 #define DRVCNF_CANCEL 0x0000

1 0

Stefan Dösinger : wined3d: Make the glram parameter of WineD3DAdapterChangeGLRam signed.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 682bae7c2b89edd658159ef152bc6d1d0dcba2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=682bae7c2b89edd658159ef15… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 17:39:21 2011 +0200 wined3d: Make the glram parameter of WineD3DAdapterChangeGLRam signed. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8b486f8..7951d02 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -329,7 +329,7 @@ fail: } /* Adjust the amount of used texture memory */ -unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *device, unsigned int glram) +unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *device, int glram) { struct wined3d_adapter *adapter = device->adapter; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 253fc52..583e56f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -137,7 +137,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (resource->pool == WINED3DPOOL_DEFAULT) { TRACE("Decrementing device memory pool by %u.\n", resource->size); - WineD3DAdapterChangeGLRam(resource->device, -resource->size); + WineD3DAdapterChangeGLRam(resource->device, 0 - resource->size); } LIST_FOR_EACH_SAFE(e1, e2, &resource->privateData) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 599f449..f076748 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1541,7 +1541,7 @@ struct wined3d_adapter BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -extern unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *D3DDevice, unsigned int glram) DECLSPEC_HIDDEN; +extern unsigned int WineD3DAdapterChangeGLRam(IWineD3DDeviceImpl *D3DDevice, int glram) DECLSPEC_HIDDEN; extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

Jacek Caban : kernel32: Moved GetMappedFileName[AW] stubs to kernel32.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 772da9baae753bbdfb5c22d6cd9f87ea05ce8327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772da9baae753bbdfb5c22d6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 11:05:11 2011 +0200 kernel32: Moved GetMappedFileName[AW] stubs to kernel32. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/virtual.c | 27 +++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 ++-- dlls/psapi/psapi_main.c | 28 ---------------------------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 31680fe..9edd92e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -772,6 +772,8 @@ @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall K32EnumProcessModules(long ptr long ptr) @ stdcall K32EnumProcesses(ptr long ptr) +@ stdcall K32GetMappedFileNameA(long ptr ptr long) +@ stdcall K32GetMappedFileNameW(long ptr ptr long) @ stdcall K32GetModuleBaseNameA(long long ptr long) @ stdcall K32GetModuleBaseNameW(long long ptr long) @ stdcall K32GetModuleFileNameExA(long long ptr long) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index dcd5b85..a901f85 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -45,6 +45,7 @@ #include "kernel_private.h" WINE_DECLARE_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(file); static unsigned int page_size; @@ -823,3 +824,29 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) __ENDTRY return FALSE; } + +/*********************************************************************** + * K32GetMappedFileNameA (KERNEL32.@) + */ +DWORD WINAPI K32GetMappedFileNameA(HANDLE process, LPVOID lpv, LPSTR file_name, DWORD size) +{ + FIXME_(file)("(%p, %p, %p, %d): stub\n", process, lpv, file_name, size); + + if (file_name && size) + file_name[0] = '\0'; + + return 0; +} + +/*********************************************************************** + * K32GetMappedFileNameW (KERNEL32.@) + */ +DWORD WINAPI K32GetMappedFileNameW(HANDLE process, LPVOID lpv, LPWSTR file_name, DWORD size) +{ + FIXME_(file)("(%p, %p, %p, %d): stub\n", process, lpv, file_name, size); + + if (file_name && size) + file_name[0] = '\0'; + + return 0; +} diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index aaf2931..a53ec04 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -8,8 +8,8 @@ @ stdcall GetDeviceDriverBaseNameW(ptr ptr long) @ stdcall GetDeviceDriverFileNameA(ptr ptr long) @ stdcall GetDeviceDriverFileNameW(ptr ptr long) -@ stdcall GetMappedFileNameA(long ptr ptr long) -@ stdcall GetMappedFileNameW(long ptr ptr long) +@ stdcall GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA +@ stdcall GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW @ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA @ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW @ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index b297b7b..8d79892 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -122,34 +122,6 @@ DWORD WINAPI GetDeviceDriverFileNameW(LPVOID ImageBase, LPWSTR lpFilename, } /*********************************************************************** - * GetMappedFileNameA (PSAPI.@) - */ -DWORD WINAPI GetMappedFileNameA(HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, - DWORD nSize) -{ - FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize); - - if (lpFilename && nSize) - lpFilename[0] = '\0'; - - return 0; -} - -/*********************************************************************** - * GetMappedFileNameW (PSAPI.@) - */ -DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, - DWORD nSize) -{ - FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize); - - if (lpFilename && nSize) - lpFilename[0] = '\0'; - - return 0; -} - -/*********************************************************************** * GetPerformanceInfo (PSAPI.@) */ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size )

1 0