November 2010 - Wine-Commits

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to drawStridedSlow().
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: 6476ef599dbec9a1f8d2383a76b46f5f82c51015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6476ef599dbec9a1f8d2383a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 29 23:08:37 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to drawStridedSlow(). --- dlls/wined3d/drawprim.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0a90da0..2f5a7c1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -55,7 +55,7 @@ static void drawStridedFast(GLenum primitive_type, UINT count, UINT idx_size, co */ /* GL locking is done by the caller */ -static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context *context, +static void drawStridedSlow(IWineD3DDeviceImpl *device, const struct wined3d_context *context, const struct wined3d_stream_info *si, UINT NumVertexes, GLenum glPrimType, const void *idxData, UINT idxSize, UINT startIdx) { @@ -63,8 +63,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context const WORD *pIdxBufS = NULL; const DWORD *pIdxBufL = NULL; UINT vx_index; - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct wined3d_state *state = &This->stateBlock->state; + const struct wined3d_state *state = &device->stateBlock->state; const struct wined3d_stream_state *streams = state->streams; LONG SkipnStrides = startIdx + state->load_base_vertex_index; BOOL pixelShader = use_ps(state); @@ -166,7 +165,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context for (textureNo = 0; textureNo < texture_stages; ++textureNo) { int coordIdx = state->texture_states[textureNo][WINED3DTSS_TEXCOORDINDEX]; - DWORD texture_idx = This->texUnitMap[textureNo]; + DWORD texture_idx = device->texUnitMap[textureNo]; if (!gl_info->supported[ARB_MULTITEXTURE] && textureNo > 0) { @@ -238,7 +237,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context coord_idx = state->texture_states[texture][WINED3DTSS_TEXCOORDINDEX]; ptr = texCoords[coord_idx] + (SkipnStrides * si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].stride); - texture_idx = This->texUnitMap[texture]; + texture_idx = device->texUnitMap[texture]; multi_texcoord_funcs[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( GL_TEXTURE0_ARB + texture_idx, ptr); } @@ -704,7 +703,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT } else { - drawStridedSlow(iface, context, stream_info, index_count, + drawStridedSlow(This, context, stream_info, index_count, glPrimType, idxData, idxSize, StartIdx); } }

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to drawPrimitive().
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

Module: wine Branch: master Commit: 363d8a316e5bf2c673d632288a38ef7074a004a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d8a316e5bf2c673d632288… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 29 23:08:38 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to drawPrimitive(). --- dlls/wined3d/device.c | 12 ++++---- dlls/wined3d/drawprim.c | 59 ++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 34 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=363d8a316e5bf2c673d63…

1 0

Henri Verbeet : ddraw/tests: Fix a typo.
by Alexandre Julliard Nov. 30, 2010

Nov. 30, 2010

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 Nov. 29, 2010

Nov. 29, 2010

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 : user32/tests: Remove obsolete comment.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

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 Nov. 29, 2010

Nov. 29, 2010

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

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

Nov. 29, 2010

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

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

Nov. 29, 2010

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 Nov. 29, 2010

Nov. 29, 2010

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

André Hentschel : wldap32/tests: Fix skipping if server is unavailable.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 08400e9dd79e965d1339c16f58286cf205421bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08400e9dd79e965d1339c16f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 29 17:52:47 2010 +0100 wldap32/tests: Fix skipping if server is unavailable. --- dlls/wldap32/tests/parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 61bc9ca..98e6b80 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -93,7 +93,7 @@ static void test_ldap_search_extW( LDAP *ld ) timelimit = 20; ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); - if (ret == LDAP_SERVER_DOWN) + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) { skip("test server can't be reached\n"); return;

1 0