wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Alexandre Julliard : winex11: Fix memory leaks in get_bitmap_argb.
by Alexandre Julliard 20 Apr '10

20 Apr '10

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

Alexandre Julliard : gdi32: Convert the driver list to a standard Wine list .
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 3858ad7bd39aa0ecd82c37b322e726efb994d622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3858ad7bd39aa0ecd82c37b32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 13:20:49 2010 +0200 gdi32: Convert the driver list to a standard Wine list. --- dlls/gdi32/driver.c | 44 +++++++++++++++++--------------------------- 1 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 639e4a8..05c2513 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -33,20 +33,20 @@ #include "gdi_private.h" #include "wine/unicode.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); struct graphics_driver { - struct graphics_driver *next; - struct graphics_driver *prev; + struct list entry; HMODULE module; /* module handle */ unsigned int count; /* reference count */ DC_FUNCTIONS funcs; }; -static struct graphics_driver *first_driver; +static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static CRITICAL_SECTION driver_section; @@ -68,8 +68,6 @@ static struct graphics_driver *create_driver( HMODULE module ) struct graphics_driver *driver; if (!(driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver)))) return NULL; - driver->next = NULL; - driver->prev = NULL; driver->module = module; driver->count = 1; @@ -213,10 +211,7 @@ static struct graphics_driver *create_driver( HMODULE module ) } else memset( &driver->funcs, 0, sizeof(driver->funcs) ); - /* add it to the list */ - driver->prev = NULL; - if ((driver->next = first_driver)) driver->next->prev = driver; - first_driver = driver; + list_add_head( &drivers, &driver->entry ); return driver; } @@ -293,7 +288,7 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) if ((module = GetModuleHandleW( name ))) { - for (driver = first_driver; driver; driver = driver->next) + LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { if (driver->module == module) { @@ -333,9 +328,9 @@ const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs ) struct graphics_driver *driver; EnterCriticalSection( &driver_section ); - for (driver = first_driver; driver; driver = driver->next) + LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) if (&driver->funcs == funcs) break; - if (!driver) ERR( "driver not found, trouble ahead\n" ); + if (&driver->entry == &drivers) ERR( "driver not found, trouble ahead\n" ); driver->count++; LeaveCriticalSection( &driver_section ); return funcs; @@ -353,21 +348,16 @@ void DRIVER_release_driver( const DC_FUNCTIONS *funcs ) EnterCriticalSection( &driver_section ); - for (driver = first_driver; driver; driver = driver->next) - if (&driver->funcs == funcs) break; - - if (!driver) goto done; - if (--driver->count) goto done; - - /* removed last reference, free it */ - if (driver->next) driver->next->prev = driver->prev; - if (driver->prev) driver->prev->next = driver->next; - else first_driver = driver->next; - if (driver == display_driver) display_driver = NULL; - - FreeLibrary( driver->module ); - HeapFree( GetProcessHeap(), 0, driver ); - done: + LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) + { + if (&driver->funcs != funcs) continue; + if (--driver->count) break; + list_remove( &driver->entry ); + if (driver == display_driver) display_driver = NULL; + FreeLibrary( driver->module ); + HeapFree( GetProcessHeap(), 0, driver ); + break; + } LeaveCriticalSection( &driver_section ); }

1 0

Nikolay Sivov : shell32/tests: Fix a test failure on W2K ( unimplemented method).
by Alexandre Julliard 20 Apr '10

20 Apr '10

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

Jaime Rave : user32: Draw the rect edges from left to right and top to bottom.
by Alexandre Julliard 20 Apr '10

20 Apr '10

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

Michael Stefaniuc : wineboot: Update the Romanian translation.
by Alexandre Julliard 20 Apr '10

20 Apr '10

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

Michael Stefaniuc : shell32: Update the Romanian translation.
by Alexandre Julliard 20 Apr '10

20 Apr '10

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

Eric Pouech : server: Fix write_process_memory on Wow64.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 1298f2233f48fe0256c3d35ab1c2931942d2112d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1298f2233f48fe0256c3d35ab… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:53 2010 +0200 server: Fix write_process_memory on Wow64. --- server/ptrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index b8a31cf..1118048 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -330,7 +330,7 @@ static long read_thread_long( struct thread *thread, long *addr, long *data ) static long write_thread_long( struct thread *thread, long *addr, long data, unsigned long mask ) { long res; - if (mask != ~0u) + if (mask != ~0ul) { if (read_thread_long( thread, addr, &res ) == -1) return -1; data = (data & mask) | (res & ~mask);

1 0

Eric Pouech : winedbg: Don't assert on some lvalue's write conditions.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: e5555b0fb554a4f10f9e113d6ce4f89d8221adf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5555b0fb554a4f10f9e113d6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:46 2010 +0200 winedbg: Don't assert on some lvalue's write conditions. --- programs/winedbg/memory.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 6560062..7d6112a 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -121,9 +121,13 @@ BOOL memory_write_value(const struct dbg_lvalue* lvalue, DWORD size, void* value BOOL ret = TRUE; DWORD64 os; - os = ~(DWORD64)size; - types_get_info(&lvalue->type, TI_GET_LENGTH, &os); - assert(size == os); + if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &os)) return FALSE; + if (size != os) + { + dbg_printf("Size mismatch in memory_write_value, got %u from type while expecting %u\n", + (DWORD)os, size); + return FALSE; + } /* FIXME: only works on little endian systems */ if (lvalue->cookie == DLV_TARGET)

1 0

Eric Pouech : winegcc: When specifying -m32, force i386 cpu when compiling on x86_64 boxes.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 22da105b4d4d8b2b91e88b1af3b270852fbe9334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22da105b4d4d8b2b91e88b1af… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:40 2010 +0200 winegcc: When specifying -m32, force i386 cpu when compiling on x86_64 boxes. --- tools/winegcc/winegcc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a5f7004..48f39bc 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1257,6 +1257,8 @@ int main(int argc, char **argv) opts.unicode_app = 1; else if (strcmp("-m32", argv[i]) == 0) { + if (opts.target_cpu == CPU_x86_64) + opts.target_cpu = CPU_x86; opts.force_pointer_size = 4; raw_linker_arg = 1; }

1 0

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

20 Apr '10

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

← Newer
1
...
29
30
31
32
33
34
35
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010