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

Henri Verbeet : wined3d: Only invalidate state for the current context in wined3d_buffer_unmap().
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: b06e32184bbe7c9a3f8500eb9a17199a933457ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06e32184bbe7c9a3f8500eb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:51 2011 +0200 wined3d: Only invalidate state for the current context in wined3d_buffer_unmap(). --- dlls/wined3d/buffer.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9b20d87..ae04138 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1136,12 +1136,13 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(device, STATE_INDEXBUFFER); - context = context_acquire(device, NULL); gl_info = context->gl_info; + ENTER_GL(); + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(buffer->buffer_type_hint, buffer->buffer_object)); if (gl_info->supported[ARB_MAP_BUFFER_RANGE])

1 0

Henri Verbeet : wined3d: Recognize some more AMD cards.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 7bc003287806ad9509162c444493e2728432fb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc003287806ad9509162c444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:52 2011 +0200 wined3d: Recognize some more AMD cards. --- dlls/wined3d/directx.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1430444..87f2606 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1175,7 +1175,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6310, "AMD Radeon HD 6310 Graphics", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6300, "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ @@ -1845,7 +1847,9 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info /* Northern Islands */ {"CAYMAN", CARD_AMD_RADEON_HD6900}, {"BARTS", CARD_AMD_RADEON_HD6800}, - {"PALM", CARD_AMD_RADEON_HD6310}, + {"TURKS", CARD_AMD_RADEON_HD6600}, + {"CAICOS", CARD_AMD_RADEON_HD6400}, + {"PALM", CARD_AMD_RADEON_HD6300}, /* Evergreen */ {"HEMLOCK", CARD_AMD_RADEON_HD5900}, {"CYPRESS", CARD_AMD_RADEON_HD5800}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bbe9d1..f4e3f3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1338,7 +1338,9 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD5850 = 0x6898, CARD_AMD_RADEON_HD5870 = 0x6899, CARD_AMD_RADEON_HD5900 = 0x689c, - CARD_AMD_RADEON_HD6310 = 0x9803, + CARD_AMD_RADEON_HD6300 = 0x9803, + CARD_AMD_RADEON_HD6400 = 0x6770, + CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719,

1 0

Henri Verbeet : wined3d: Don' t hide GL function pointer typedefs behind extension defines.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 3d7c596cdc90fd01976844e38aa1de94ce6c9716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7c596cdc90fd01976844e38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:53 2011 +0200 wined3d: Don't hide GL function pointer typedefs behind extension defines. These are specific to wined3d. --- dlls/wined3d/wined3d_gl.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 24c366e..5088782 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1892,9 +1892,9 @@ typedef void (WINE_GLAPI *PGLFNFINISHOBJECTAPPLEPROC)(GLenum, GLuint); #define GL_APPLE_flush_buffer_range 1 #define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8a12 #define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8a13 +#endif typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE)(GLenum target, GLenum pname, GLint param); typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); -#endif /* GL_APPLE_flush_render */ typedef void (WINE_GLAPI *PGLFNFLUSHRENDERAPPLEPROC)(void); @@ -1969,15 +1969,15 @@ typedef void (WINE_GLAPI *PGLFNDRAWBUFFERSARBPROC)(GLsizei n, const GLenum *bufs /* GL_ARB_draw_elements_base_vertex */ #ifndef GL_ARB_draw_elements_base_vertex #define GL_ARB_draw_elements_base_vertex 1 +#endif typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); typedef void (WINE_GLAPI *PGLFNDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum mode, GLuint start, GLuint end, - GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); + GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum mode, GLsizei count, - GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); + GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); typedef void (WINE_GLAPI *PGLFNMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei *count, GLenum type, - const GLvoid **indices, GLsizei primcount, GLint *basevertex); -#endif + const GLvoid **indices, GLsizei primcount, GLint *basevertex); /* GL_ARB_fragment_program */ #ifndef GL_ARB_fragment_program @@ -3083,11 +3083,11 @@ typedef void (WINE_GLAPI *PGLFNGLGENERATEMIPMAPEXTPROC)(GLenum target); /* GL_EXT_gpu_program_parameters */ #ifndef GL_EXT_gpu_program_parameters #define GL_EXT_gpu_program_parameters 1 +#endif typedef void (WINE_GLAPI *PGLFNPROGRAMENVPARAMETERS4FVEXTPROC)(GLenum target, GLuint index, GLsizei count, const float *params); typedef void (WINE_GLAPI *PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC)(GLenum target, GLuint index, GLsizei count, const float *params); -#endif /* GL_EXT_gpu_shader4 */ #ifndef GL_EXT_gpu_shader4

1 0

Alexandre Julliard : rpcrt4: Pass the full argument format to the size/ marshall/unmarshall wrappers to greatly simplify the argument processing.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: f3734fd68712063714a4ea80173a62e127887066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3734fd68712063714a4ea801… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:13:45 2011 +0200 rpcrt4: Pass the full argument format to the size/marshall/unmarshall wrappers to greatly simplify the argument processing. --- dlls/rpcrt4/ndr_stubless.c | 376 ++++++++++++++++++-------------------------- 1 files changed, 151 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3734fd68712063714a4e…

1 0

Alexandre Julliard : rpcrt4: Use the same phase values for clients and stubs.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 78e8fccbd65c5536c449111826527e192eb1cf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e8fccbd65c5536c44911182… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:34:57 2011 +0200 rpcrt4: Use the same phase values for clients and stubs. --- dlls/rpcrt4/ndr_es.c | 6 +- dlls/rpcrt4/ndr_stubless.c | 442 ++++++++++++++++++++------------------------ dlls/rpcrt4/ndr_stubless.h | 15 ++- 3 files changed, 217 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78e8fccbd65c5536c4491…

1 0

Henri Verbeet : wined3d: wined3d_device_evict_managed_resources() doesn' t need a return value.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 2256a7e804b1767ea827f6c908c404c95e1810e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2256a7e804b1767ea827f6c90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:54 2011 +0200 wined3d: wined3d_device_evict_managed_resources() doesn't need a return value. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/ddraw.c | 8 ++++---- dlls/wined3d/device.c | 4 +--- include/wine/wined3d.h | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5c4568d..e93976e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -361,16 +361,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(IDirect3D DWORD Bytes) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, byte_count %u.\n", iface, Bytes); if (Bytes) FIXME("Byte count ignored.\n"); wined3d_mutex_lock(); - hr = wined3d_device_evict_managed_resources(This->wined3d_device); + wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D8 **ppD3D8) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 74d8383..2456e16 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -304,15 +304,14 @@ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(IDirect3DDevice9E static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(IDirect3DDevice9Ex *iface) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_evict_managed_resources(This->wined3d_device); + wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 40d27ed..70e8895 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5158,15 +5158,15 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) { IDirectDrawImpl *This = impl_from_IDirect3D7(iface); - HRESULT hr; + TRACE("iface %p!\n", iface); EnterCriticalSection(&ddraw_cs); - if (!This->d3d_initialized) hr = D3D_OK; - else hr = wined3d_device_evict_managed_resources(This->wined3d_device); + if (This->d3d_initialized) + wined3d_device_evict_managed_resources(This->wined3d_device); LeaveCriticalSection(&ddraw_cs); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16327e4..84c7789 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5386,7 +5386,7 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) return oldVisible; } -HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) +void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { struct wined3d_resource *resource, *cursor; @@ -5405,8 +5405,6 @@ HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *devi /* Invalidate stream sources, the buffer(s) may have been evicted. */ device_invalidate_state(device, STATE_STREAMSRC); - - return WINED3D_OK; } static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0a09ec6..bfc1b39 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2204,7 +2204,7 @@ HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UIN const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); -HRESULT __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); +void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer);

1 0

André Hentschel : user32: Fix for finding nested default buttons.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: a3551214144c2b973a5a048e81e265a7aeec0363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3551214144c2b973a5a048e8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 26 20:39:28 2011 +0200 user32: Fix for finding nested default buttons. --- dlls/comctl32/tests/propsheet.c | 1 - dlls/user32/dialog.c | 34 +++++++++++++++++++++++++++++++++- dlls/user32/tests/dialog.c | 2 +- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index f6b4c7d..89c548f 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -502,7 +502,6 @@ static void test_custom_default_button(void) } } - todo_wine ok(add_button_has_been_pressed, "The Add button has not been pressed!\n"); DestroyWindow(hdlg); diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 2aa89d9..1e47374 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1120,6 +1120,38 @@ static void DIALOG_FixChildrenOnChangeFocus (HWND hwndDlg, HWND hwndNext) } /*********************************************************************** + * DIALOG_IdToHwnd + * + * A recursive version of GetDlgItem + * + * RETURNS + * The HWND for a Child ID. + */ +static HWND DIALOG_IdToHwnd( HWND hwndDlg, INT id ) +{ + int i; + HWND *list = WIN_ListChildren( hwndDlg ); + HWND ret = 0; + + if (!list) return 0; + + for (i = 0; list[i]; i++) + { + if (GetWindowLongPtrW( list[i], GWLP_ID ) == id) + { + ret = list[i]; + break; + } + + /* Recurse into every child */ + if ((ret = DIALOG_IdToHwnd( list[i], id ))) break; + } + + HeapFree( GetProcessHeap(), 0, list ); + return ret; +} + +/*********************************************************************** * IsDialogMessageW (USER32.@) */ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) @@ -1227,7 +1259,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) } else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { - HWND hwndDef = GetDlgItem(hwndDlg, LOWORD(dw)); + HWND hwndDef = DIALOG_IdToHwnd(hwndDlg, LOWORD(dw)); if (hwndDef ? IsWindowEnabled(hwndDef) : LOWORD(dw)==IDOK) SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)hwndDef); } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 1a1cd75..8e4ffb5 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -709,7 +709,7 @@ static void test_WM_NEXTDLGCTL(void) g_bReceivedCommand = FALSE; FormEnterMsg (&msg, child3); ok(IsDialogMessage (g_hwndTestDlg, &msg), "Did not handle the ENTER\n"); - todo_wine ok(g_bReceivedCommand, "Did not trigger the default Button action\n"); + ok(g_bReceivedCommand, "Did not trigger the default Button action\n"); DestroyWindow(child3); DestroyWindow(child2);

1 0

Austin English : user32/tests: Remove win9x hacks.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 5e941f89c2dfcfb7e4e7f66638c7505dc2b78d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e941f89c2dfcfb7e4e7f6663… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 19:11:34 2011 -0700 user32/tests: Remove win9x hacks. --- dlls/user32/tests/edit.c | 8 ++------ dlls/user32/tests/resource.c | 12 +++++------- dlls/user32/tests/static.c | 4 +--- dlls/user32/tests/text.c | 8 +------- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d279f0d..c6c815a 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1318,9 +1318,7 @@ static void test_edit_control_limittext(void) ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); SendMessage(hwEdit, EM_SETLIMITTEXT, 0, 0); r = SendMessage(hwEdit, EM_GETLIMITTEXT, 0, 0); - /* Win9x+ME: 32766; WinNT: 2147483646UL */ - ok( (r == 32766) || (r == 2147483646UL), - "got limit %u (expected 32766 or 2147483646)\n", r); + ok( r == 2147483646, "got limit %u (expected 2147483646)\n", r); DestroyWindow(hwEdit); /* Test default limit for multi-line control */ @@ -1330,9 +1328,7 @@ static void test_edit_control_limittext(void) ok(r == 30000, "Incorrect default text limit, expected 30000 got %u\n", r); SendMessage(hwEdit, EM_SETLIMITTEXT, 0, 0); r = SendMessage(hwEdit, EM_GETLIMITTEXT, 0, 0); - /* Win9x+ME: 65535; WinNT: 4294967295UL */ - ok( (r == 65535) || (r == 4294967295UL), - "got limit %u (expected 65535 or 4294967295)\n", r); + ok( r == 4294967295U, "got limit %u (expected 4294967295)\n", r); DestroyWindow(hwEdit); } diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index c64aff0..5bc2d7a 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -180,12 +180,10 @@ static void test_accel1(void) ok( hAccel != NULL, "create accelerator table\n"); r = CopyAcceleratorTable( hAccel, NULL, 0 ); - ok( r == n || broken(r == 2), /* win9x */ - "two entries in table %u/%u\n", r, n); + ok( r == n, "two entries in table %u/%u\n", r, n); r = CopyAcceleratorTable( hAccel, &ac[0], n ); - ok( r == n || broken(r == 2), /* win9x */ - "still should be two entries in table %u/%u\n", r, n); + ok( r == n, "still should be two entries in table %u/%u\n", r, n); n=0; ok( ac[n].cmd == 1000, "cmd 0 not preserved got %x\n", ac[n].cmd); @@ -262,11 +260,11 @@ static void test_accel2(void) hac = CreateAcceleratorTable( &ac[0], 2); ok( hac != NULL , "fail\n"); res = CopyAcceleratorTable( hac, NULL, 100 ); - ok( res == 2 || broken(res == 0), /* win9x */ "copy null failed %d\n", res); + ok( res == 2, "copy null failed %d\n", res); res = CopyAcceleratorTable( hac, NULL, 0 ); ok( res == 2, "copy null failed %d\n", res); res = CopyAcceleratorTable( hac, NULL, 1 ); - ok( res == 2 || broken(res == 0), /* win9x */ "copy null failed %d\n", res); + ok( res == 2, "copy null failed %d\n", res); ok( 1 == CopyAcceleratorTable( hac, out, 1 ), "copy 1 failed\n"); ok( 2 == CopyAcceleratorTable( hac, out, 2 ), "copy 2 failed\n"); ok( DestroyAcceleratorTable( hac ), "destroy failed\n"); @@ -318,7 +316,7 @@ static void test_accel2(void) hac = CreateAcceleratorTable( &ac[0], 2); ok( hac != NULL , "fail\n"); res = CopyAcceleratorTable( hac, out, 2 ); - ok( res == 2 || broken(res == 1), /* win9x */ "copy 2 failed %d\n", res); + ok( res == 2, "copy 2 failed %d\n", res); /* ok( memcmp( ac, out, sizeof ac ), "tables not different\n"); */ ok( out[0].cmd == ac[0].cmd, "cmd modified\n"); ok( out[0].fVirt == (ac[0].fVirt&0x7f), "fVirt not modified\n"); diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index d04f725..b761356 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -95,9 +95,7 @@ static void test_updates(int style, int flags) if (flags & TODO_COUNT) todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } else if ((style & SS_TYPEMASK) == SS_ICON || (style & SS_TYPEMASK) == SS_BITMAP) - ok( g_nReceivedColorStatic == exp || - broken(g_nReceivedColorStatic == 0), /* win9x */ - "expected %u got %u\n", exp, g_nReceivedColorStatic ); + ok( g_nReceivedColorStatic == exp, "expected %u got %u\n", exp, g_nReceivedColorStatic ); else expect_eq(g_nReceivedColorStatic, exp, int, "%d"); DestroyWindow(hStatic); diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index b45a312..1874b15 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -114,13 +114,7 @@ static void test_DrawTextCalcRect(void) heightcheck = textheight = DrawTextExA(hdc, text, 0, &rect, DT_CALCRECT, NULL ); ok( !EMPTY(rect) && !MODIFIED(rect), "rectangle should NOT be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); - if (textheight != 0) /* Windows 98 */ - { - win_skip("XP conformity failed, skipping XP tests. Probably win9x\n"); - conform_xp = FALSE; - } - else - ok(textheight==0,"Got textheight from DrawTextExA\n"); + ok(textheight==0,"Got textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, text, 0, &rect, DT_CALCRECT);

1 0

Jacek Caban : wininet: Fixed realm allocation in cache_basic_authorization.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 0281b7d30b5679e9dffac5bd788aa719a7961786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0281b7d30b5679e9dffac5bd7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 16:53:57 2011 +0200 wininet: Fixed realm allocation in cache_basic_authorization. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f8386b8..dab96b9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -873,7 +873,7 @@ static void cache_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR auth_data { ad = heap_alloc(sizeof(basicAuthorizationData)); ad->host = heap_strdupW(host); - ad->host = heap_strdupW(realm); + ad->realm = heap_strdupW(realm); ad->authorization = heap_alloc(auth_data_len); memcpy(ad->authorization, auth_data, auth_data_len); ad->authorizationLen = auth_data_len;

1 0

Jacek Caban : urlmon: Fixed duplicated IUri creation in CoInternetGetSecurityUrlEx.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: cbaf5f4663f20b6448731148d9d94becb33aaca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaf5f4663f20b6448731148d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 17:08:33 2011 +0200 urlmon: Fixed duplicated IUri creation in CoInternetGetSecurityUrlEx. --- dlls/urlmon/sec_mgr.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e1763fc..6b3f9de 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1823,12 +1823,6 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION if(FAILED(hres)) return hres; - hres = CreateUri(ret_url, Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME, 0, ppSecUri); - if(FAILED(hres)) { - CoTaskMemFree(ret_url); - return hres; - } - /* File URIs have to hierarchical. */ hres = IUri_GetScheme(pUri, (DWORD*)&scheme_type); if(SUCCEEDED(hres) && scheme_type == URL_SCHEME_FILE) {

1 0