wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Alex Villacís Lasso : user32: Fix LB_ITEMFROMPOINT tests for listbox control.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 5f603f823e3f9da62d44b28a4df0895d5e3549ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f603f823e3f9da62d44b28a4… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Nov 7 10:34:55 2007 -0500 user32: Fix LB_ITEMFROMPOINT tests for listbox control. --- dlls/user32/tests/listbox.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 663e37f..7fd5659 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -441,7 +441,12 @@ static void test_listbox_height(void) static void test_itemfrompoint(void) { - HWND hList = CreateWindow( "ListBox", "list test", 0, + /* WS_POPUP is required in order to have a more accurate size calculation ( + without caption). LBS_NOINTEGRALHEIGHT is required in order to test + behavior of partially-displayed item. + */ + HWND hList = CreateWindow( "ListBox", "list test", + WS_VISIBLE|WS_POPUP|LBS_NOINTEGRALHEIGHT, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); LONG r, id; RECT rc; @@ -464,10 +469,14 @@ static void test_itemfrompoint(void) r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); ok( r == 0x1, "ret %x\n", r ); - r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 37 )); + r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); ok( r == 0x10001, "ret %x\n", r ); - + /* Resize control so that below assertions about sizes are valid */ + r = SendMessage( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); + ok( r == 1, "ret %x\n", r); + r = MoveWindow(hList, 1, 1, 600, (rc.bottom - rc.top + 1) * 9 / 2, TRUE); + ok( r != 0, "ret %x\n", r); id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi2"); ok( id == 2, "item id wrong\n");

1 0

Alexandre Julliard : winebuild: Add a few nops to stub entry points to make Safedisc happy.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: c32e02e48d3aeba7588b566973c9fb02253e8a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32e02e48d3aeba7588b56697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 20:36:04 2007 +0100 winebuild: Add a few nops to stub entry points to make Safedisc happy. --- tools/winebuild/import.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index da4b1db..1e9cfe3 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1194,8 +1194,19 @@ void output_stubs( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", asm_name(name) ); - output( "\tsubl $4,%%esp\n" ); + /* flesh out the stub a bit to make safedisc happy */ + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + + output( "\tsubl $4,%%esp\n" ); if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") );

1 0

Alexandre Julliard : user32: Removed unused NC_DrawGrayButton function.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 4f5c61ac7cbbd4b27dd783c788006748c851d1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5c61ac7cbbd4b27dd783c78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 19:46:34 2007 +0100 user32: Removed unused NC_DrawGrayButton function. --- dlls/user32/nonclient.c | 36 ------------------------------------ 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index f93b94f..45ac8cf 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -32,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(nonclient); -BOOL NC_DrawGrayButton(HDC hdc, int x, int y); - static const BYTE lpGrayMask[] = { 0xAA, 0xA0, 0x55, 0x50, 0xAA, 0xA0, @@ -1626,40 +1624,6 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) return 0; } -/************************************************************* -* NC_DrawGrayButton -* -* Stub for the grayed button of the caption -* -*************************************************************/ - -BOOL NC_DrawGrayButton(HDC hdc, int x, int y) -{ - HBITMAP hMaskBmp; - HDC hdcMask; - HBRUSH hOldBrush; - - hMaskBmp = CreateBitmap (12, 10, 1, 1, lpGrayMask); - - if(hMaskBmp == 0) - return FALSE; - - hdcMask = CreateCompatibleDC (0); - SelectObject (hdcMask, hMaskBmp); - - /* Draw the grayed bitmap using the mask */ - hOldBrush = SelectObject (hdc, (HGDIOBJ)RGB(128, 128, 128)); - BitBlt (hdc, x, y, 12, 10, - hdcMask, 0, 0, 0xB8074A); - - /* Clean up */ - SelectObject (hdc, hOldBrush); - DeleteObject(hMaskBmp); - DeleteDC (hdcMask); - - return TRUE; -} - /*********************************************************************** * GetTitleBarInfo (USER32.@) * TODO: Handle STATE_SYSTEM_PRESSED

1 0

Alexandre Julliard : user32: Make all internal user32 functions and variables hidden.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: c57b5057dbb3e27d3672ff2d50d19fbf98c0cfa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57b5057dbb3e27d3672ff2d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 18:05:49 2007 +0100 user32: Make all internal user32 functions and variables hidden. --- dlls/user32/class.c | 13 ------- dlls/user32/controls.h | 79 +++++++++++++++++++++++++------------------ dlls/user32/dde_private.h | 80 ++++++++++++++++++++++---------------------- dlls/user32/user_private.h | 74 ++++++++++++++++++++-------------------- include/win.h | 46 ++++++++++++------------ 5 files changed, 146 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c57b5057dbb3e27d3672f…

1 0

Alexandre Julliard : gdi32: Make all internal gdi functions hidden.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 9a368cc4756a5bd3ca6fe9380062bec95732a82d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a368cc4756a5bd3ca6fe9380… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 17:50:57 2007 +0100 gdi32: Make all internal gdi functions hidden. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 144 ++++++++++++++-------------- dlls/gdi32/gdi_private.h | 173 +++++++++++++++++----------------- dlls/gdi32/mfdrv/metafiledrv.h | 162 ++++++++++++++++---------------- 3 files changed, 240 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a368cc4756a5bd3ca6fe…

1 0

Detlef Riekenberg : winspool: Use unsigned type to avoid a compiler warning .
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: d244a55cce0bb17fc22571c3b144f13091710371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d244a55cce0bb17fc22571c3b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 17:57:54 2007 +0100 winspool: Use unsigned type to avoid a compiler warning. --- dlls/winspool.drv/info.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index c4381d4..adb1b63 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -145,7 +145,7 @@ static struct list monitor_handles = LIST_INIT( monitor_handles ); static monitor_t * pm_localport; static opened_printer_t **printer_handles; -static int nb_printer_handles; +static UINT nb_printer_handles; static LONG next_job_id = 1; static DWORD (WINAPI *GDI_CallDeviceCapabilities16)( LPCSTR lpszDevice, LPCSTR lpszPort, @@ -1566,11 +1566,9 @@ static opened_printer_t *get_opened_printer(HANDLE hprn) EnterCriticalSection(&printer_handles_cs); - if ((idx <= 0) || (idx > nb_printer_handles)) - goto end; - - ret = printer_handles[idx - 1]; -end: + if ((idx > 0) && (idx <= nb_printer_handles)) { + ret = printer_handles[idx - 1]; + } LeaveCriticalSection(&printer_handles_cs); return ret; }

1 0

Alexandre Julliard : wine.inf: Add APPDATA and LOCALAPPDATA environment variables.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 28b32972d95185ccafa3430a1db41c2671aa0f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b32972d95185ccafa3430a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:32:57 2007 +0100 wine.inf: Add APPDATA and LOCALAPPDATA environment variables. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index fdb47b9..338dbd2 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -253,7 +253,9 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll" [Environment] +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"APPDATA",,"%16410%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\cmd.exe" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"LOCALAPPDATA",,"%16412%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",2,"%11%;%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:"

1 0

Dan Kegel : msvcrt: Fix two buglets in heap test.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: a1e4758f076190dbef7d06f9e10241d0aabe3788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e4758f076190dbef7d06f9e… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Nov 6 16:52:19 2007 -0800 msvcrt: Fix two buglets in heap test. --- dlls/msvcrt/tests/heap.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 6dac9b4..e2e9a4a 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -148,11 +148,12 @@ static void test_aligned_realloc(size_t size1, size_t size2, size_t alignment) } } } - } - else + p_aligned_free(mem2); + } else { ok(errno == EINVAL, "_aligned_realloc(%p, %d, %d) errno: %d != %d\n", mem, size2, alignment, errno, EINVAL); + p_aligned_free(mem); + } - p_aligned_free(mem); free(mem1); } else @@ -219,11 +220,12 @@ static void test_aligned_offset_realloc(size_t size1, size_t size2, size_t align } } } - } - else + p_aligned_free(mem2); + } else { ok(errno == EINVAL, "_aligned_offset_realloc(%p, %d, %d, %d) errno: %d != %d\n", mem, size2, alignment, offset, errno, EINVAL); + p_aligned_free(mem); + } - p_aligned_free(mem); free(mem1); } else @@ -353,5 +355,8 @@ START_TEST(heap) mem = realloc(NULL, 0); ok(mem != NULL, "memory not (re)allocated for size 0\n"); + if (mem) + free(mem); + test_aligned(); }

1 0

Alistair Leslie-Hughes : msxml3: Fix memory leak.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 2ad4f102f7b72046233c4de28c49dd1504af7890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad4f102f7b72046233c4de28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 7 12:39:11 2007 +1100 msxml3: Fix memory leak. --- dlls/msxml3/xmlelem.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 787b13f..5af43a7 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -340,6 +340,8 @@ static HRESULT WINAPI xmlelem_get_text(IXMLElement *iface, BSTR *p) content = xmlNodeGetContent(This->node); *p = bstr_from_xmlChar(content); TRACE("returning %s\n", debugstr_w(*p)); + + xmlFree(content); return S_OK; }

1 0

Juan Lang : rsaenh: Use LocalFree to free memory return by Crypt(Un) ProtectData.
by Alexandre Julliard 07 Nov '07

07 Nov '07

Module: wine Branch: master Commit: 8788cca0eff2e64e541123c6f3869543dfe462b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8788cca0eff2e64e541123c6f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 6 13:58:55 2007 -0800 rsaenh: Use LocalFree to free memory return by Crypt(Un)ProtectData. --- dlls/rsaenh/rsaenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2d89751..776c6e7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -895,7 +895,7 @@ static void store_key_pair(HCRYPTKEY hCryptKey, HKEY hKey, LPCSTR szValueName, D { RegSetValueExA(hKey, szValueName, 0, REG_BINARY, blobOut.pbData, blobOut.cbData); - HeapFree(GetProcessHeap(), 0, blobOut.pbData); + LocalFree(blobOut.pbData); } } HeapFree(GetProcessHeap(), 0, pbKey); @@ -1135,7 +1135,7 @@ static BOOL read_key_value(HCRYPTPROV hKeyContainer, HKEY hKey, LPCSTR szValueNa { ret = RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, phCryptKey); - HeapFree(GetProcessHeap(), 0, blobOut.pbData); + LocalFree(blobOut.pbData); } } HeapFree(GetProcessHeap(), 0, pbKey);

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
76
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 November 2007