April 2010 - Wine-Commits - list.winehq.org

Jaime Rave : user32: Draw the rect edges from left to right and top to bottom.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 61052164043c8ba8be9a53e29de03e4371fced0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=61052164043c8ba8be9a53e29… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Mon Apr 19 21:07:01 2010 -0500 user32: Draw the rect edges from left to right and top to bottom. --- dlls/user32/uitools.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 80490cf..9fe2044 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -511,13 +511,13 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, SelectObject(hdc, RBOuterPen); if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.left-1, InnerRect.bottom-1); + MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); + LineTo(hdc, InnerRect.right-1, InnerRect.bottom-1); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-1, InnerRect.bottom-1, NULL); - LineTo(hdc, InnerRect.right-1, InnerRect.top-1); + MoveToEx(hdc, InnerRect.right-1, InnerRect.top, NULL); + LineTo(hdc, InnerRect.right-1, InnerRect.bottom); } /* Draw the inner edge */ @@ -535,13 +535,13 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, SelectObject(hdc, RBInnerPen); if(uFlags & BF_BOTTOM) { - MoveToEx(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2, NULL); - LineTo(hdc, InnerRect.left-1+LBpenplus, InnerRect.bottom-2); + MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); + LineTo(hdc, InnerRect.right-1-RBpenplus, InnerRect.bottom-2); } if(uFlags & BF_RIGHT) { - MoveToEx(hdc, InnerRect.right-2, InnerRect.bottom-1-RBpenplus, NULL); - LineTo(hdc, InnerRect.right-2, InnerRect.top-1+RTpenplus); + MoveToEx(hdc, InnerRect.right-2, InnerRect.top+2-RBpenplus, NULL); + LineTo(hdc, InnerRect.right-2, InnerRect.bottom-2+RTpenplus); } if( ((uFlags & BF_MIDDLE) && retval) || (uFlags & BF_ADJUST) )

1 0

Nikolay Sivov : comctl32/listview: Exit early on LVM_CREATEDRAGIMAGE if null pointer passed for a point.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 7371d0d2fcb2fcaf8b60d63f299ded51fc7c43f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7371d0d2fcb2fcaf8b60d63f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 02:23:28 2010 +0400 comctl32/listview: Exit early on LVM_CREATEDRAGIMAGE if null pointer passed for a point. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 642a8aa..9ca52c5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5209,7 +5209,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP HIMAGELIST dragList = 0; TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount); - if (iItem < 0 || iItem >= infoPtr->nItemCount) + if (iItem < 0 || iItem >= infoPtr->nItemCount || !lppt) return 0; rcItem.left = LVIR_BOUNDS; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 59c3dc1..2c5ef70 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4344,6 +4344,28 @@ static void test_header_notification(void) DestroyWindow(list); } +static void test_createdragimage(void) +{ + HIMAGELIST himl; + POINT pt; + HWND list; + + list = create_listview_control(LVS_ICON); + ok(list != 0, "failed to create listview window\n"); + + insert_item(list, 0); + + /* NULL point */ + himl = (HIMAGELIST)SendMessageA(list, LVM_CREATEDRAGIMAGE, 0, 0); + ok(himl == NULL, "got %p\n", himl); + + himl = (HIMAGELIST)SendMessageA(list, LVM_CREATEDRAGIMAGE, 0, (LPARAM)&pt); + ok(himl != NULL, "got %p\n", himl); + ImageList_Destroy(himl); + + DestroyWindow(list); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4406,6 +4428,7 @@ START_TEST(listview) test_finditem(); test_hover(); test_destroynotify(); + test_createdragimage(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Nikolay Sivov : shell32/tests: Fix a test failure on W2K ( unimplemented method).
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: f375123f011f648f91ee3d7072b30bf881968d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f375123f011f648f91ee3d707… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 02:57:09 2010 +0400 shell32/tests: Fix a test failure on W2K (unimplemented method). --- dlls/shell32/tests/shfldr_special.c | 48 ++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 7be2bdf..24374bc 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -162,32 +162,34 @@ if (0) hr = IShellFolder2_GetDefaultColumnState(folder, 6, &state); ok(broken(hr == E_NOTIMPL) || hr == E_INVALIDARG /* Win7 */, "got 0x%08x\n", hr); - for(i = 0; i < 6; i++) + hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); + ok(hr == S_OK || broken(E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr); + /* test every column if method is implemented */ + if (hr == S_OK) { - hr = IShellFolder2_GetDetailsOf(folder, NULL, i, &details); - /* doesn't work on W2K */ - if (hr == E_NOTIMPL) break; - - ok(hr == S_OK, "got 0x%08x\n", hr); - /* all columns are left-aligned */ - ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt); - /* can't be on w9x at this point, IShellFolder2 unsupported there, - check present for running Wine with w9x setup */ - if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); - - hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); - /* all columns are string except document count */ - if (i == 1) - ok(state == (SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); - else - ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); + ok(details.str.uType == STRRET_WSTR, "got %d\n", details.str.uType); + + for(i = 0; i < 6; i++) + { + hr = IShellFolder2_GetDetailsOf(folder, NULL, i, &details); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* all columns are left-aligned */ + ok(details.fmt == LVCFMT_LEFT, "got 0x%x\n", details.fmt); + /* can't be on w9x at this point, IShellFolder2 unsupported there, + check present for running Wine with w9x setup */ + if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); + + hr = IShellFolder2_GetDefaultColumnState(folder, i, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + /* all columns are string except document count */ + if (i == 1) + ok(state == (SHCOLSTATE_TYPE_INT | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); + else + ok(state == (SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT), "got 0x%x\n", state); + } } - hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(details.str.uType == STRRET_WSTR, "got %d\n", details.str.uType); - /* default pidl */ hr = IShellFolder2_QueryInterface(folder, &IID_IPersistFolder2, (void**)&pf); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : winex11: Fix memory leaks in get_bitmap_argb.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: f84f9394112436810941d8e2b43875f246bff44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84f9394112436810941d8e2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 13:55:11 2010 +0200 winex11: Fix memory leaks in get_bitmap_argb. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dac2874..1621861 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -859,7 +859,9 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns for (i = 0; i < bm.bmHeight; i++) for (j = 0; j < bm.bmWidth; j++, ptr++) if ((mask_bits[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr |= 0xff000000; + HeapFree( GetProcessHeap(), 0, mask_bits ); } + HeapFree( GetProcessHeap(), 0, info ); /* convert to array of longs */ if (bits && sizeof(long) > sizeof(int))

1 0

Eric Pouech : winedbg: For stack info command, display information in 'a' format (instead of 'x') to get word size machine (instead of forcing 32bit ).
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 285200b29bbd43a1deea25b32454cf10bef1f0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=285200b29bbd43a1deea25b32… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:26 2010 +0200 winedbg: For stack info command, display information in 'a' format (instead of 'x') to get word size machine (instead of forcing 32bit). --- programs/winedbg/stack.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 7ba2773..bccb56a 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -50,7 +50,9 @@ void stack_info(void) dbg_printf("Stack dump:\n"); switch (lvalue.addr.Mode) { - case AddrModeFlat: /* 32-bit mode */ + case AddrModeFlat: /* 32-bit or 64-bit mode */ + memory_examine(&lvalue, 24, 'a'); + break; case AddrMode1632: /* 32-bit mode */ memory_examine(&lvalue, 24, 'x'); break;

1 0

Michael Stefaniuc : shell32: Update the Romanian translation.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: e64779919777c39a4eaa16ff9eea4789936a7f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64779919777c39a4eaa16ff9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 20 02:36:53 2010 +0200 shell32: Update the Romanian translation. --- dlls/shell32/shell32_Ro.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Ro.rc b/dlls/shell32/shell32_Ro.rc index f7a5011..a74f135 100644 --- a/dlls/shell32/shell32_Ro.rc +++ b/dlls/shell32/shell32_Ro.rc @@ -208,6 +208,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Grup" IDS_SHV_COLUMN_DELFROM "Locația originală" IDS_SHV_COLUMN_DELDATE "Data ștergerii" + IDS_SHV_COL_DOCS "Documente" + IDS_SHV_COL_STATUS "Stare" + IDS_SHV_COL_LOCATION "Locație" + IDS_SHV_COL_MODEL "Model" /* special folders */ IDS_DESKTOP "Birou"

1 0

Michael Stefaniuc : wineboot: Update the Romanian translation.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 06a9ff98d78c9b4e581a53475abe35e89c1db6ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a9ff98d78c9b4e581a53475… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 20 02:37:02 2010 +0200 wineboot: Update the Romanian translation. --- programs/wineboot/wineboot_Ro.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_Ro.rc b/programs/wineboot/wineboot_Ro.rc index 61f670f..a9bee98 100644 --- a/programs/wineboot/wineboot_Ro.rc +++ b/programs/wineboot/wineboot_Ro.rc @@ -38,3 +38,13 @@ BEGIN LTEXT "Prin terminarea acestui proces se pot pierde datele nesalvate.", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "Actualizez configurația Wine în %s, așteptați...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Eric Pouech : winegcc: On x86-64, don't define twice the fastcall macros.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: d4dfcc1f321be6eee478c8bbada31ca89cf607c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4dfcc1f321be6eee478c8bba… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:33 2010 +0200 winegcc: On x86-64, don't define twice the fastcall macros. --- tools/winegcc/winegcc.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7023ff4..a5f7004 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -360,6 +360,7 @@ static void compile(struct options* opts, const char* lang) if (gcc_defs) { + int fastcall_done = 0; if (opts->target_cpu == CPU_x86_64) { strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); @@ -368,6 +369,7 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); + fastcall_done = 1; } else if (opts->target_platform == PLATFORM_APPLE) { @@ -385,8 +387,11 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__))"); } - strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + if (!fastcall_done) + { + strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); + strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + } strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))"); strarray_add(comp_args, "-D__declspec_allocate(x)=__attribute__((section(x)))");

1 0

Maarten Lankhorst : ntdll: Clear alignment flag in exception handlers.
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 8734d5b9acb2ae85a8da2160f881ad27551edc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8734d5b9acb2ae85a8da2160f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 22:36:22 2010 +0200 ntdll: Clear alignment flag in exception handlers. --- dlls/ntdll/signal_i386.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4998820..7a60c2a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -873,6 +873,15 @@ static int solaris_sigaction( int sig, const struct sigaction *new, struct sigac typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); +extern void clear_alignment_flag(void); +__ASM_GLOBAL_FUNC( clear_alignment_flag, + "pushfl\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "andl $~0x40000,(%esp)\n\t" + "popfl\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "ret" ) + /*********************************************************************** * init_handler @@ -884,6 +893,8 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD * { TEB *teb = get_current_teb(); + clear_alignment_flag(); + /* get %fs and %gs at time of the fault */ #ifdef FS_sig *fs = LOWORD(FS_sig(sigcontext));

1 0

Henri Verbeet : wined3d: Get rid of a useless local variable in IWineD3DDeviceImpl_SetDepthStencilSurface ().
by Alexandre Julliard April 20, 2010

April 20, 2010

Module: wine Branch: master Commit: 5056fd309d88d463e453df2db17d5a1c5f42ea89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5056fd309d88d463e453df2db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 19 20:47:02 2010 +0200 wined3d: Get rid of a useless local variable in IWineD3DDeviceImpl_SetDepthStencilSurface(). --- dlls/wined3d/device.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 64d884e..35be80c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5907,7 +5907,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface *pNewZStencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *tmp; - HRESULT hr = WINED3D_OK; TRACE("device %p, depth_stencil %p, old depth_stencil %p.\n", This, pNewZStencil, This->depth_stencil); @@ -5938,7 +5937,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * This->depth_stencil = (IWineD3DSurfaceImpl *)pNewZStencil; if (This->depth_stencil) IWineD3DSurface_AddRef((IWineD3DSurface *)This->depth_stencil); if (tmp) IWineD3DSurface_Release((IWineD3DSurface *)tmp); - hr = WINED3D_OK; if((!tmp && pNewZStencil) || (!pNewZStencil && tmp)) { /* Swapping NULL / non NULL depth stencil affects the depth and tests */ @@ -5948,7 +5946,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * } } - return hr; + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* iface, UINT XHotSpot,

1 0