November 2010 - Wine-commits

Henri Verbeet : wined3d: Explicitly pass data and gl_info to shader_select_depth_blt().
by Alexandre Julliard 30 Nov '10

30 Nov '10

Module: wine Branch: master Commit: 93a824d744ac360efb78526754ceb769919b1a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a824d744ac360efb7852675… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 29 23:08:39 2010 +0100 wined3d: Explicitly pass data and gl_info to shader_select_depth_blt(). --- dlls/wined3d/arb_program_shader.c | 7 +++---- dlls/wined3d/glsl_shader.c | 6 ++---- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ca9d0e6..e1bd3aa 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4624,13 +4624,12 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, } /* GL locking is done by the caller */ -static void shader_arb_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type, const SIZE *ds_mask_size) +static void shader_arb_select_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info, + enum tex_types tex_type, const SIZE *ds_mask_size) { const float mask[] = {0.0f, 0.0f, (float)ds_mask_size->cx, (float)ds_mask_size->cy}; - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; BOOL masked = ds_mask_size->cx && ds_mask_size->cy; - struct shader_arb_priv *priv = This->shader_priv; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; + struct shader_arb_priv *priv = shader_priv; GLuint *blt_fprogram; if (!priv->depth_blt_vprogram_id) priv->depth_blt_vprogram_id = create_arb_blt_vertex_program(gl_info); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2b1d5b1..3a609e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4622,13 +4622,11 @@ static void shader_glsl_select(const struct wined3d_context *context, BOOL usePS } /* GL locking is done by the caller */ -static void shader_glsl_select_depth_blt(IWineD3DDevice *iface, +static void shader_glsl_select_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info, enum tex_types tex_type, const SIZE *ds_mask_size) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; BOOL masked = ds_mask_size->cx && ds_mask_size->cy; - struct shader_glsl_priv *priv = This->shader_priv; + struct shader_glsl_priv *priv = shader_priv; GLhandleARB *blt_program; GLint loc; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ffe66e8..8f4a72d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1510,7 +1510,8 @@ static void shader_cleanup(IWineD3DBaseShader *iface) static void shader_none_handle_instruction(const struct wined3d_shader_instruction *ins) {} static void shader_none_select(const struct wined3d_context *context, BOOL usePS, BOOL useVS) {} -static void shader_none_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type, const SIZE *ds_mask_size) {} +static void shader_none_select_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info, + enum tex_types tex_type, const SIZE *ds_mask_size) {} static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} static void shader_none_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) {} diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6399e63..f6b1a10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4102,8 +4102,8 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl if (compare_mode != GL_NONE) glTexParameteri(info.bind_target, GL_TEXTURE_COMPARE_MODE_ARB, GL_NONE); } - device->shader_backend->shader_select_depth_blt((IWineD3DDevice *)device, - info.tex_type, &This->ds_current_size); + device->shader_backend->shader_select_depth_blt(device->shader_priv, + gl_info, info.tex_type, &This->ds_current_size); glBegin(GL_TRIANGLE_STRIP); glTexCoord3fv(info.coords[0]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1f2b70..d264dce 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -744,7 +744,8 @@ struct wined3d_state; typedef struct { void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); void (*shader_select)(const struct wined3d_context *context, BOOL usePS, BOOL useVS); - void (*shader_select_depth_blt)(IWineD3DDevice *iface, enum tex_types tex_type, const SIZE *ds_mask_size); + void (*shader_select_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info, + enum tex_types tex_type, const SIZE *ds_mask_size); void (*shader_deselect_depth_blt)(IWineD3DDevice *iface); void (*shader_update_float_vertex_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_update_float_pixel_constants)(IWineD3DDevice *iface, UINT start, UINT count);

1 0

Henri Verbeet : wined3d: Explicitly pass data and gl_info to shader_deselect_depth_blt().
by Alexandre Julliard 30 Nov '10

30 Nov '10

Module: wine Branch: master Commit: 7363b0e98a1d6eb79c188b8b453c71d0d151fb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7363b0e98a1d6eb79c188b8b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 29 23:08:40 2010 +0100 wined3d: Explicitly pass data and gl_info to shader_deselect_depth_blt(). --- dlls/wined3d/arb_program_shader.c | 19 +++++++++++-------- dlls/wined3d/glsl_shader.c | 7 +++---- dlls/wined3d/shader.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e1bd3aa..32dbaa3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4644,17 +4644,18 @@ static void shader_arb_select_depth_blt(void *shader_priv, const struct wined3d_ } /* GL locking is done by the caller */ -static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_arb_priv *priv = This->shader_priv; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; +static void shader_arb_deselect_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info) +{ + struct shader_arb_priv *priv = shader_priv; if (priv->current_vprogram_id) { GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id)); checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, vertexShader->prgId);"); - TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id); - } else { + TRACE("Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB.\n", priv->current_vprogram_id); + } + else + { glDisable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); } @@ -4663,8 +4664,10 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixelShader->prgId);"); - TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - } else if(!priv->use_arbfp_fixed_func) { + TRACE("Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB.\n", priv->current_fprogram_id); + } + else if(!priv->use_arbfp_fixed_func) + { glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3a609e1..992b6bb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4651,10 +4651,9 @@ static void shader_glsl_select_depth_blt(void *shader_priv, const struct wined3d } /* GL locking is done by the caller */ -static void shader_glsl_deselect_depth_blt(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - struct shader_glsl_priv *priv = This->shader_priv; +static void shader_glsl_deselect_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info) +{ + struct shader_glsl_priv *priv = shader_priv; GLhandleARB program_id; program_id = priv->glsl_program ? priv->glsl_program->programId : 0; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8f4a72d..ed37fe1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1512,7 +1512,7 @@ static void shader_none_handle_instruction(const struct wined3d_shader_instructi static void shader_none_select(const struct wined3d_context *context, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info, enum tex_types tex_type, const SIZE *ds_mask_size) {} -static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} +static void shader_none_deselect_depth_blt(void *shader_priv, const struct wined3d_gl_info *gl_info) {} static void shader_none_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_load_constants(const struct wined3d_context *context, char usePS, char useVS) {} diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f6b1a10..c54f6ae 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4121,7 +4121,7 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl glPopAttrib(); - device->shader_backend->shader_deselect_depth_blt((IWineD3DDevice *)device); + device->shader_backend->shader_deselect_depth_blt(device->shader_priv, gl_info); } void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d264dce..9c9a952 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -746,7 +746,7 @@ typedef struct { void (*shader_select)(const struct wined3d_context *context, BOOL usePS, BOOL useVS); void (*shader_select_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info, enum tex_types tex_type, const SIZE *ds_mask_size); - void (*shader_deselect_depth_blt)(IWineD3DDevice *iface); + void (*shader_deselect_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info); void (*shader_update_float_vertex_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_update_float_pixel_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_load_constants)(const struct wined3d_context *context, char usePS, char useVS);

1 0

Henri Verbeet : ddraw/tests: Fix a typo.
by Alexandre Julliard 30 Nov '10

30 Nov '10

Module: wine Branch: master Commit: 8c2416941e406c8fafcd3537000acd40392953eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2416941e406c8fafcd35370… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 29 23:08:36 2010 +0100 ddraw/tests: Fix a typo. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 8bc849d..7416c93 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2370,7 +2370,7 @@ static void SizeTest(void) desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; desc.dwWidth = 128; ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Creating an offscreen plain surface without hight info returned %08x\n", ret); + ok(ret == DDERR_INVALIDPARAMS, "Creating an offscreen plain surface without height info returned %08x\n", ret); if(dsurface) { IDirectDrawSurface_Release(dsurface);

1 0

André Hentschel : Fix Homepage donate link
by Jeremy Newman 29 Nov '10

29 Nov '10

Module: website Branch: master Commit: 5390c6d92a5a39126a46a9607ffca8ba1c702199 URL: http://source.winehq.org/git/website.git/?a=commit;h=5390c6d92a5a39126a46a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 29 20:37:19 2010 +0100 Fix Homepage donate link this time utf-8 save --- templates/de/home.template | 2 +- templates/en/home.template | 2 +- templates/es/home.template | 2 +- templates/fr/home.template | 2 +- templates/he/home.template | 2 +- templates/pl/home.template | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index cd392d0..912950c 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -44,7 +44,7 @@ <div class="donate" onClick="document.location='{$root}/donate/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="javascript:document.donateForm.submit();">Spenden</a></div> + <div class="title"><a href="{$root}/donate/">Spenden</a></div> <div class="subtitle">Spende dem Wine-Projekt.</div> </div> </div> diff --git a/templates/en/home.template b/templates/en/home.template index fc6c85e..d75d1ea 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -44,7 +44,7 @@ <div class="donate" onClick="document.location='{$root}/donate/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="javascript:document.donateForm.submit();">Donate</a></div> + <div class="title"><a href="{$root}/donate/">Donate</a></div> <div class="subtitle">Donate to the Wine project.</div> </div> </div> diff --git a/templates/es/home.template b/templates/es/home.template index f2afd8d..94d59fa 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -44,7 +44,7 @@ <div class="donate" onClick="document.location='{$root}/donate/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="javascript:document.donateForm.submit();">Dona</a></div> + <div class="title"><a href="{$root}/donate/">Dona</a></div> <div class="subtitle">Haz una donación al proyecto Wine.</div> </div> </div> diff --git a/templates/fr/home.template b/templates/fr/home.template index 2de2c80..1326d82 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -44,7 +44,7 @@ <div class="donate" onClick="document.location='{$root}/donate/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="javascript:document.donateForm.submit();">Dons</a></div> + <div class="title"><a href="{$root}/donate/">Dons</a></div> <div class="subtitle">Faites un don au projet Wine.</div> </div> </div> diff --git a/templates/he/home.template b/templates/he/home.template index 7953ed6..a31ab78 100644 --- a/templates/he/home.template +++ b/templates/he/home.template @@ -44,7 +44,7 @@ <div class="donate" onClick="document.location='{$root}/donate/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="javascript:document.donateForm.submit();">תרומה</a></div> + <div class="title"><a href="{$root}/donate/">ה</a></div> <div class="subtitle">תרומה למיזם Wine.</div> </div> </div> diff --git a/templates/pl/home.template b/templates/pl/home.template index 7584775..b039d66 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -44,7 +44,7 @@ <div class="donate" onClick="document.location='{$root}/donate/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="javascript:document.donateForm.submit();">Darowizny</a></div> + <div class="title"><a href="{$root}/donate/">Darowizny</a></div> <div class="subtitle">Ofiary dla Wine.</div> </div> </div>

1 0

André Hentschel : gdi32/tests: Fix test on WinME.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 1f6f4329fdb54981ec85764bb6bb6d0f3ccf4e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6f4329fdb54981ec85764bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 29 17:52:56 2010 +0100 gdi32/tests: Fix test on WinME. --- dlls/gdi32/tests/dc.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5d56caa..cdfea10 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -528,12 +528,15 @@ static void test_boundsrect_invalid(void) "Expected GetBoundsRect to return 0, got %u\n", ret); ret = GetBoundsRect(hdc, &rect, 0); - ok(ret == DCB_RESET, - "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret); - SetRect(&expect, 0, 0, 0, 0); - ok(EqualRect(&rect, &expect), - "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n", - rect.left, rect.top, rect.right, rect.bottom); + if (ret != DCB_SET) /* WinME */ + { + ok(ret == DCB_RESET, + "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret); + SetRect(&expect, 0, 0, 0, 0); + ok(EqualRect(&rect, &expect), + "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n", + rect.left, rect.top, rect.right, rect.bottom); + } } if (GetBoundsRect(hdc, NULL, 0) == DCB_RESET)

1 0

André Hentschel : user32/tests: Remove obsolete comment.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 37adf3a6bef8ae1a4e4872604f326284b17e3f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=37adf3a6bef8ae1a4e4872604… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 29 17:53:24 2010 +0100 user32/tests: Remove obsolete comment. --- dlls/user32/tests/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e0d5b42..5a7c2db 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -233,7 +233,7 @@ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) ADDTOINPUTS(td[i]) strcat(buf, getdesc[td[i]]); if(td[i]) - expmsg[i].message = KbdMessage(td[i], &(expmsg[i].wParam), &(expmsg[i].lParam)); /* see queue_kbd_event() */ + expmsg[i].message = KbdMessage(td[i], &(expmsg[i].wParam), &(expmsg[i].lParam)); else expmsg[i].message = 0; }

1 0

André Hentschel : winemaker: Remove unused target constants.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 5d95857c27f262d97b76a95f744011290c814bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d95857c27f262d97b76a95f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 29 17:53:12 2010 +0100 winemaker: Remove unused target constants. --- tools/winemaker | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 68483b8..7eb45ec 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -224,10 +224,6 @@ my $T_LIBRARY_PATH=15; # The list of Unix libraries to link with my $T_LIBRARIES=16; -## -# The list of dependencies between targets -my $T_DEPENDS=17; - # The following constants define the recognized types of target @@ -278,7 +274,6 @@ sub target_init($) my $target=$_[0]; @$target[$T_TYPE]=$TT_SETTINGS; - # leaving $T_INIT undefined @$target[$T_FLAGS]=$opt_flags; @$target[$T_SOURCES_C]=[]; @$target[$T_SOURCES_CXX]=[];

1 0

Austin Lund : user32/tests: Fix test failures by disabling IME when testing unicode input.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: c82aa505e914020136c75191331a4d5723f1219d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82aa505e914020136c751913… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Nov 29 15:59:00 2010 +1000 user32/tests: Fix test failures by disabling IME when testing unicode input. --- dlls/user32/tests/input.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 5a7c2db..9eb72c5 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1139,6 +1139,8 @@ static void test_Input_unicode(void) WNDCLASSW wclass; HANDLE hInstance = GetModuleHandleW(NULL); HHOOK hook; + HMODULE hModuleImm32; + BOOL (WINAPI *pImmDisableIME)(DWORD); wclass.lpszClassName = classNameW; wclass.style = CS_HREDRAW | CS_VREDRAW; @@ -1154,6 +1156,16 @@ static void test_Input_unicode(void) win_skip("Unicode functions not supported\n"); return; } + + hModuleImm32 = LoadLibrary("imm32.dll"); + if (hModuleImm32) { + pImmDisableIME = (void *)GetProcAddress(hModuleImm32, "ImmDisableIME"); + if (pImmDisableIME) + pImmDisableIME(0); + } + pImmDisableIME = NULL; + FreeLibrary(hModuleImm32); + /* create the test window that will receive the keystrokes */ hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100,

1 0

Marcus Meissner : wined3d: Detect nouveau as NVIDIA.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 5d657bfdba3262d0b4af147fd4f660a104bbe52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d657bfdba3262d0b4af147fd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 29 10:28:21 2010 +0100 wined3d: Detect nouveau as NVIDIA. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8a832bf..742627d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1373,7 +1373,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer) { - if (strstr(gl_vendor_string, "NVIDIA")) + if (strstr(gl_vendor_string, "NVIDIA") + || strstr(gl_vendor_string, "nouveau")) return HW_VENDOR_NVIDIA; if (strstr(gl_vendor_string, "ATI")

1 0

Francois Gouget : server: Make sock_check_pollhup() more reliable on Solaris.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: c4c03180b0868fe93de4a5ccf52ba76bb00ffcab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c03180b0868fe93de4a5ccf… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 26 18:08:30 2010 +0100 server: Make sock_check_pollhup() more reliable on Solaris. --- server/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/sock.c b/server/sock.c index 04ae748..d37a316 100644 --- a/server/sock.c +++ b/server/sock.c @@ -203,7 +203,8 @@ static sock_shutdown_t sock_check_pollhup(void) pfd.events = POLLIN; pfd.revents = 0; - n = poll( &pfd, 1, 0 ); + /* Solaris' poll() sometimes returns nothing if given a 0ms timeout here */ + n = poll( &pfd, 1, 1 ); if ( n != 1 ) goto out; /* error or timeout */ if ( pfd.revents & POLLHUP ) ret = SOCK_SHUTDOWN_POLLHUP;

1 0