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

Alexandre Julliard : winapi: Add a few more types to the ntdll generated tests.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: b141e6e33bd1eada44c9e4e36d61aa10c0545758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b141e6e33bd1eada44c9e4e36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 17:25:19 2010 +0200 winapi: Add a few more types to the ntdll generated tests. --- dlls/ntdll/tests/generated.c | 655 ++++++++++++++++++++++++++++++++++++++++++ tools/winapi/tests.dat | 12 +- 2 files changed, 666 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b141e6e33bd1eada44c9e…

1 0

Alexandre Julliard : msvcrt: Fix an unused variable warning.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: da840f57e5902b39c23c220a03679367a1554717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da840f57e5902b39c23c220a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 14:25:19 2010 +0200 msvcrt: Fix an unused variable warning. --- dlls/msvcrt/math.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index fb2cd86..93e13d0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -706,8 +706,9 @@ unsigned int CDECL _controlfp(unsigned int newval, unsigned int mask) */ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) { - unsigned int flags; #ifdef __i386__ + unsigned int flags; + FIXME("(%p %u %u) semi-stub\n", cur, newval, mask); flags = _control87( newval, mask & ~MSVCRT__EM_DENORMAL );

1 0

Alexandre Julliard : winapi: Add some support for handling ifdefs, particularly ifdef _WIN64.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 6b11a3c3f81d7db3794f3320eeaef8001cc99b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b11a3c3f81d7db3794f3320e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 17:22:51 2010 +0200 winapi: Add some support for handling ifdefs, particularly ifdef _WIN64. --- tools/winapi/c_type.pm | 5 +++++ tools/winapi/winapi_test | 27 +++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index 4e54270..b00cf81 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -330,30 +330,35 @@ sub new($$$) sub align($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_aligns(); return $self->{TYPE}->field_aligns()->[$self->{NUMBER}]; } sub base_size($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_base_sizes(); return $self->{TYPE}->field_base_sizes()->[$self->{NUMBER}]; } sub name($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_names(); return $self->{TYPE}->field_names()->[$self->{NUMBER}]; } sub offset($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_offsets(); return $self->{TYPE}->field_offsets()->[$self->{NUMBER}]; } sub size($) { my ($self) = @_; + return undef unless defined $self->{TYPE}->field_sizes(); return $self->{TYPE}->field_sizes()->[$self->{NUMBER}]; } diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index cf3a2b6..cafbafb 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -352,6 +352,7 @@ foreach my $file (@files) { my $line; my $type; my @packs = (4); + my @ifdefs = (); my $update_output = sub { my $progress = ""; @@ -384,19 +385,37 @@ foreach my $file (@files) { #print "found_preprocessor: $begin_line: [$_]\n"; if ($preprocessor =~ /^\#\s*include\s+[\"<]pshpack(\d+)\.h[\">]$/) { - push @packs, $1; + push @packs, $1 unless @ifdefs && !$ifdefs[$#ifdefs]; #print "found pack $1 on line $begin_line\n"; } elsif($preprocessor =~ /^\#\s*include\s+[\"<]poppack\.h[\">]$/) { - pop @packs; + pop @packs unless @ifdefs && !$ifdefs[$#ifdefs]; #print "found poppack on line $begin_line\n"; - } - + } elsif ($preprocessor =~ /^\#\s*ifdef\s+_WIN64/) { + push @ifdefs, 0; + } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { + push @ifdefs, 1; + } elsif ($preprocessor =~ /^\#\s*elif\s+defined(_WIN64)/) { + $ifdefs[$#ifdefs] = 0; + } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { + push @ifdefs, 2; + } elsif ($preprocessor =~ /^\#\s*ifndef\s/) { + push @ifdefs, 2; + } elsif ($preprocessor =~ /^\#\s*if/) { + push @ifdefs, 2; + } elsif ($preprocessor =~ /^\#\s*else/) { + $ifdefs[$#ifdefs] = $ifdefs[$#ifdefs] ^ 1; + } elsif ($preprocessor =~ /^\#\s*elif/) { + $ifdefs[$#ifdefs] = 2; + } elsif ($preprocessor =~ /^\#\s*endif/) { + pop @ifdefs; + } return 1; }; $parser->set_found_preprocessor_callback($found_preprocessor); my $found_type = sub { $type = shift; + return if @ifdefs && !$ifdefs[$#ifdefs]; &$update_output();

1 0

Christian Costa : d3dx9_36: Forward D3DXCreateTextureFromFileExW to D3DXCreateTextureFromFileInMemoryEx .
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 36ef502e2f737f717d503f35e9e6c3b18239cbe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ef502e2f737f717d503f35e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Apr 6 21:44:16 2010 +0200 d3dx9_36: Forward D3DXCreateTextureFromFileExW to D3DXCreateTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 329e501..5c5a1a6 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -95,7 +95,7 @@ @ stdcall D3DXCreateTexture(ptr long long long long long long ptr) @ stub D3DXCreateTextureFromFileA @ stub D3DXCreateTextureFromFileExA -@ stub D3DXCreateTextureFromFileExW +@ stdcall D3DXCreateTextureFromFileExW(ptr ptr long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateTextureFromFileInMemory @ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateTextureFromFileW diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 7447d81..2b1b468 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -70,3 +70,40 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, return E_NOTIMPL; } + +HRESULT WINAPI D3DXCreateTextureFromFileExW(LPDIRECT3DDEVICE9 device, + LPCWSTR srcfile, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO *srcinfo, + PALETTEENTRY *palette, + LPDIRECT3DTEXTURE9 *texture) +{ + HRESULT hr; + DWORD size; + LPVOID buffer; + + TRACE("(%p, %p, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", device, debugstr_w(srcfile), width, + height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); + + if (!srcfile) + return D3DERR_INVALIDCALL; + + hr = map_view_of_file(srcfile, &buffer, &size); + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + + hr = D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, height, miplevels, usage, format, pool, + filter, mipfilter, colorkey, srcinfo, palette, texture); + + UnmapViewOfFile(buffer); + + return hr; +}

1 0

Alexandre Julliard : msvcr90/tests: Fix the calling convention of the initterm callbacks.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 701dd23911437c393c91e8e4cd15f86c996c0584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701dd23911437c393c91e8e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 14:25:32 2010 +0200 msvcr90/tests: Fix the calling convention of the initterm callbacks. --- dlls/msvcr90/tests/msvcr90.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2ae8c15..e094b1a 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -55,19 +55,19 @@ void __cdecl test_invalid_parameter_handler(const wchar_t *expression, ok(res == NULL, "res = %p\n", res); } -static int initterm_cb0(void) +static int __cdecl initterm_cb0(void) { cb_called[0]++; return 0; } -static int initterm_cb1(void) +static int __cdecl initterm_cb1(void) { cb_called[1]++; return 1; } -static int initterm_cb2(void) +static int __cdecl initterm_cb2(void) { cb_called[2]++; return 2;

1 0

Alexandre Julliard : winapi: Generate the 64-bit variant of structure size/ alignment tests.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: a8e86e35dd1822e62893eb47af14b7b0e8e11b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e86e35dd1822e62893eb47a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 17:22:51 2010 +0200 winapi: Generate the 64-bit variant of structure size/alignment tests. --- dlls/gdi32/tests/generated.c | 6934 +++++++++++++++++++++++++++++++++++++-- dlls/kernel32/tests/generated.c | 1983 +++++++++++- dlls/ntdll/tests/generated.c | 3269 ++++++++++++++++++- dlls/rpcrt4/tests/generated.c | 953 +++++- dlls/shell32/tests/generated.c | 1876 ++++++++++- dlls/shlwapi/tests/generated.c | 113 +- dlls/urlmon/tests/generated.c | 320 ++- dlls/user32/tests/generated.c | 3704 ++++++++++++++++++++- dlls/wininet/tests/generated.c | 1371 ++++++++- tools/winapi/winapi_test | 105 +- 10 files changed, 19842 insertions(+), 786 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8e86e35dd1822e62893e…

1 0

Eric Pouech : winedbg: Allow using 8-byte long hardware assisted breakpoints on x86_64 CPUs.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 5f23b94a27eec0ad405682f4c16f54a78f370596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f23b94a27eec0ad405682f4c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:49 2010 +0200 winedbg: Allow using 8-byte long hardware assisted breakpoints on x86_64 CPUs. --- programs/winedbg/be_x86_64.c | 4 +++- programs/winedbg/break.c | 11 ++++++----- programs/winedbg/debugger.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index ac7f1fc..514310b 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -355,6 +355,7 @@ extern void be_x86_64_disasm_one_insn(ADDRESS64* addr, int display); #define DR7_LEN_1 (0x0) #define DR7_LEN_2 (0x4) #define DR7_LEN_4 (0xC) +#define DR7_LEN_8 (0x8) #define DR7_LOCAL_ENABLE_SHIFT 0 #define DR7_GLOBAL_ENABLE_SHIFT 1 @@ -429,10 +430,11 @@ static unsigned be_x86_64_insert_Xpoint(HANDLE hProcess, const struct be_process *pr = (DWORD64)addr; if (type != be_xpoint_watch_exec) switch (size) { + case 8: bits |= DR7_LEN_8; break; case 4: bits |= DR7_LEN_4; break; case 2: bits |= DR7_LEN_2; break; case 1: bits |= DR7_LEN_1; break; - default: return 0; + default: WINE_FIXME("Unsupported xpoint_watch of size %d\n", size); return 0; } *val = reg; /* clear old values */ diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index e72f2b6..e35250c 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -137,7 +137,7 @@ static int init_xpoint(int type, const ADDRESS64* addr) * * Returns the value watched by watch point 'num'. */ -static BOOL get_watched_value(int num, LPDWORD val) +static BOOL get_watched_value(int num, DWORD64* val) { BYTE buf[4]; @@ -147,6 +147,7 @@ static BOOL get_watched_value(int num, LPDWORD val) switch (dbg_curr_process->bp[num].w.len + 1) { + case 8: *val = *(DWORD64*)buf; break; case 4: *val = *(DWORD*)buf; break; case 2: *val = *(WORD*)buf; break; case 1: *val = *(BYTE*)buf; break; @@ -554,7 +555,7 @@ static int find_triggered_watch(void) */ for (i = 0; i < dbg_curr_process->next_bp; i++) { - DWORD val = 0; + DWORD64 val = 0; if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && (be_cpu->is_watchpoint_set(&dbg_context, bp[i].info))) @@ -577,7 +578,7 @@ static int find_triggered_watch(void) */ for (i = 0; i < dbg_curr_process->next_bp; i++) { - DWORD val = 0; + DWORD64 val = 0; if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && get_watched_value(i, &val)) @@ -740,8 +741,8 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) case be_xpoint_watch_write: dbg_printf("Stopped on watchpoint %d at ", dbg_curr_thread->stopped_xpoint); print_address(addr, TRUE); - dbg_printf(" new value %u\n", - dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval); + dbg_printf(" new value %s\n", + wine_dbgstr_longlong(dbg_curr_process->bp[dbg_curr_thread->stopped_xpoint].w.oldval)); } return FALSE; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 9d9c1b2..d8e1ef4 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -139,7 +139,7 @@ struct dbg_breakpoint struct /* only used for watchpoints */ { BYTE len : 2; - DWORD oldval; + DWORD64 oldval; } w; struct expr* condition; };

1 0

Eric Pouech : winedbg: Simplify a bit the find_triggered_watch function.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 23671868054c2dfc8150f1aeb8086a44998cf785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23671868054c2dfc8150f1aeb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 6 22:28:43 2010 +0200 winedbg: Simplify a bit the find_triggered_watch function. --- programs/winedbg/break.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index ed382bc..e72f2b6 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -535,16 +535,15 @@ void break_enable_xpoint(int num, BOOL enable) * find_triggered_watch * * Lookup the watchpoints to see if one has been triggered - * Return >= (watch point index) if one is found and *oldval is set to - * the value watched before the TRAP - * Return -1 if none found (*oldval is undetermined) + * Return >= (watch point index) if one is found + * Return -1 if none found * - * Unfortunately, Linux does *NOT* (A REAL PITA) report with ptrace + * Unfortunately, Linux used to *NOT* (A REAL PITA) report with ptrace * the DR6 register value, so we have to look with our own need the * cause of the TRAP. * -EP */ -static int find_triggered_watch(LPDWORD oldval) +static int find_triggered_watch(void) { int found = -1; int i; @@ -562,7 +561,6 @@ static int find_triggered_watch(LPDWORD oldval) { be_cpu->clear_watchpoint(&dbg_context, bp[i].info); - *oldval = bp[i].w.oldval; if (get_watched_value(i, &val)) { bp[i].w.oldval = val; @@ -584,8 +582,7 @@ static int find_triggered_watch(LPDWORD oldval) if (bp[i].refcount && bp[i].enabled && !is_xpoint_break(i) && get_watched_value(i, &val)) { - *oldval = bp[i].w.oldval; - if (val != *oldval) + if (val != bp[i].w.oldval) { be_cpu->clear_watchpoint(&dbg_context, bp[i].info); bp[i].w.oldval = val; @@ -782,8 +779,6 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code) */ void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_break) { - DWORD oldval = 0; - /* break / watch points are handled on first chance */ if ( !first_chance ) { @@ -806,7 +801,7 @@ void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_br { dbg_curr_thread->stopped_xpoint = find_xpoint(addr, be_xpoint_watch_exec); if (dbg_curr_thread->stopped_xpoint < 0) - dbg_curr_thread->stopped_xpoint = find_triggered_watch(&oldval); + dbg_curr_thread->stopped_xpoint = find_triggered_watch(); if (dbg_curr_thread->stopped_xpoint > 0) { /* If not single-stepping, do not back up over the break instruction */

1 0

Dmitry Timoshkov : comctl32: Do not use width of the passed to ImageList_Add bitmap as an icon width.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 93437fc963378e2b56632aac12fc05f90645619b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93437fc963378e2b56632aac1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 7 18:27:52 2010 +0900 comctl32: Do not use width of the passed to ImageList_Add bitmap as an icon width. --- dlls/comctl32/imagelist.c | 61 ++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index f4f0b45..83b563c 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -79,7 +79,7 @@ typedef struct static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 }; -static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count, UINT width); +static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); static inline BOOL is_valid(HIMAGELIST himl); @@ -107,9 +107,9 @@ static inline void imagelist_point_from_index( HIMAGELIST himl, UINT index, LPPO pt->y = (index/TILE_COUNT) * himl->cy; } -static inline void imagelist_get_bitmap_size( HIMAGELIST himl, UINT count, UINT cx, SIZE *sz ) +static inline void imagelist_get_bitmap_size( HIMAGELIST himl, UINT count, SIZE *sz ) { - sz->cx = cx * TILE_COUNT; + sz->cx = himl->cx * TILE_COUNT; sz->cy = imagelist_height( count ) * himl->cy; } @@ -154,29 +154,29 @@ static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDe * This function CANNOT be used to reduce the number of images. */ static void -IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy) +IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) { HDC hdcBitmap; HBITMAP hbmNewBitmap, hbmNull; INT nNewCount; SIZE sz; - if ((himl->cCurImage + nImageCount <= himl->cMaxImage) - && (himl->cy >= cy)) + TRACE("%p has %d allocated %d images\n", himl, himl->cCurImage, himl->cMaxImage); + + if (himl->cCurImage + nImageCount <= himl->cMaxImage) return; - if (cx == 0) cx = himl->cx; - nNewCount = himl->cCurImage + nImageCount + himl->cGrow; + nNewCount = himl->cCurImage + max(nImageCount, himl->cGrow) + 1; - imagelist_get_bitmap_size(himl, nNewCount, cx, &sz); + imagelist_get_bitmap_size(himl, nNewCount, &sz); - TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, cy, nNewCount); + TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, sz.cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cx); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount); if (hbmNewBitmap == 0) - ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, cy); + ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, sz.cy); if (himl->cCurImage) { @@ -245,9 +245,14 @@ ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask) if (!GetObjectW(hbmImage, sizeof(BITMAP), &bmp)) return -1; + TRACE("himl %p, cCurImage %d, cMaxImage %d, cGrow %d, cx %d, cy %d\n", + himl, himl->cCurImage, himl->cMaxImage, himl->cGrow, himl->cx, himl->cy); + nImageCount = bmp.bmWidth / himl->cx; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); + TRACE("%p has %d images (%d x %d)\n", hbmImage, nImageCount, bmp.bmWidth, bmp.bmHeight); + + IMAGELIST_InternalExpandBitmaps(himl, nImageCount); hdcBitmap = CreateCompatibleDC(0); @@ -349,7 +354,7 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) else nImageCount = 0; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps(himl, nImageCount); nIndex = himl->cCurImage; himl->cCurImage += nImageCount; @@ -636,7 +641,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, himl->uBitsPixel = (UINT)GetDeviceCaps (himl->hdcImage, BITSPIXEL); if (himl->cMaxImage > 0) { - himl->hbmImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage, cx); + himl->hbmImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject(himl->hdcImage, himl->hbmImage); } else himl->hbmImage = 0; @@ -644,7 +649,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, if ((himl->cMaxImage > 0) && (himl->flags & ILC_MASK)) { SIZE sz; - imagelist_get_bitmap_size(himl, himl->cMaxImage, himl->cx, &sz); + imagelist_get_bitmap_size(himl, himl->cMaxImage, &sz); himl->hbmMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); if (himl->hbmMask == 0) { ERR("Error creating mask bitmap!\n"); @@ -1290,7 +1295,7 @@ ImageList_Duplicate (HIMAGELIST himlSrc) { SIZE sz; - imagelist_get_bitmap_size(himlSrc, himlSrc->cCurImage, himlSrc->cx, &sz); + imagelist_get_bitmap_size(himlSrc, himlSrc->cCurImage, &sz); BitBlt (himlDst->hdcImage, 0, 0, sz.cx, sz.cy, himlSrc->hdcImage, 0, 0, SRCCOPY); @@ -2058,14 +2063,14 @@ ImageList_Remove (HIMAGELIST himl, INT i) for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; - hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage, himl->cx); + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage); himl->hbmImage = hbmNewImage; if (himl->hbmMask) { - imagelist_get_bitmap_size(himl, himl->cMaxImage, himl->cx, &sz); + imagelist_get_bitmap_size(himl, himl->cMaxImage, &sz); hbmNewMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); SelectObject (himl->hdcMask, hbmNewMask); DeleteObject (himl->hbmMask); @@ -2080,9 +2085,9 @@ ImageList_Remove (HIMAGELIST himl, INT i) TRACE(" - Number of images: %d / %d (Old/New)\n", himl->cCurImage, himl->cCurImage - 1); - hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage, himl->cx); + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); - imagelist_get_bitmap_size(himl, himl->cMaxImage, himl->cx, &sz ); + imagelist_get_bitmap_size(himl, himl->cMaxImage, &sz ); if (himl->hbmMask) hbmNewMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); else @@ -2282,7 +2287,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) - IMAGELIST_InternalExpandBitmaps (himl, 1, 0, 0); + IMAGELIST_InternalExpandBitmaps(himl, 1); nIndex = himl->cCurImage; himl->cCurImage++; @@ -2517,14 +2522,14 @@ ImageList_SetIconSize (HIMAGELIST himl, INT cx, INT cy) for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; - hbmNew = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage, himl->cx); + hbmNew = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNew); DeleteObject (himl->hbmImage); himl->hbmImage = hbmNew; if (himl->hbmMask) { SIZE sz; - imagelist_get_bitmap_size(himl, himl->cMaxImage, himl->cx, &sz); + imagelist_get_bitmap_size(himl, himl->cMaxImage, &sz); hbmNew = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); SelectObject (himl->hdcMask, hbmNew); DeleteObject (himl->hbmMask); @@ -2572,7 +2577,7 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, himl->cx); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount); if (hbmNewBitmap != 0) { @@ -2592,7 +2597,7 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) if (himl->hbmMask) { SIZE sz; - imagelist_get_bitmap_size( himl, nNewCount, himl->cx, &sz ); + imagelist_get_bitmap_size( himl, nNewCount, &sz ); hbmNewBitmap = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); if (hbmNewBitmap != 0) { @@ -2791,13 +2796,13 @@ ImageList_Write (HIMAGELIST himl, LPSTREAM pstm) } -static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count, UINT width) +static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) { HBITMAP hbmNewBitmap; UINT ilc = (himl->flags & 0xFE); SIZE sz; - imagelist_get_bitmap_size( himl, count, width, &sz ); + imagelist_get_bitmap_size( himl, count, &sz ); if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) {

1 0

Alexandre Julliard : shlwapi/tests: Fix some pointer conversion warnings on 64-bit.
by Alexandre Julliard April 7, 2010

April 7, 2010

Module: wine Branch: master Commit: 2083aa3d687301313b6e6fc2976980c234fa6ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2083aa3d687301313b6e6fc29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 14:25:09 2010 +0200 shlwapi/tests: Fix some pointer conversion warnings on 64-bit. --- dlls/shlwapi/tests/ordinal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 0d6e165..cfc25e1 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2023,7 +2023,7 @@ static HRESULT WINAPI IOleCommandTargetImpl_Exec( VARIANT *pvaIn, VARIANT *pvaOut) { - add_call(&trace_got, 3, CmdGroup, (void*)nCmdID, (void*)nCmdexecopt, pvaIn, pvaOut); + add_call(&trace_got, 3, CmdGroup, (void*)(DWORD_PTR)nCmdID, (void*)(DWORD_PTR)nCmdexecopt, pvaIn, pvaOut); return S_OK; } @@ -2237,7 +2237,7 @@ static HRESULT WINAPI IProfferServiceImpl_ProfferService(IProfferService *iface, static HRESULT WINAPI IProfferServiceImpl_RevokeService(IProfferService *iface, DWORD cookie) { - add_call(&trace_got, 4, (void*)cookie, 0, 0, 0, 0); + add_call(&trace_got, 4, (void*)(DWORD_PTR)cookie, 0, 0, 0, 0); return S_OK; } @@ -2300,7 +2300,7 @@ static void test_IUnknown_ProfferService(void) add_call(&trace_expected, 1, proff, &IID_IServiceProvider, 0, 0, 0); add_call(&trace_expected, 2, &IID_IProfferService, &IID_IProfferService, 0, 0, 0); - add_call(&trace_expected, 4, (void*)cookie, 0, 0, 0, 0); + add_call(&trace_expected, 4, (void*)(DWORD_PTR)cookie, 0, 0, 0, 0); init_call_trace(&trace_got); hr = pIUnknown_ProfferService((IUnknown*)proff, &dummy_serviceid, 0, &cookie);

1 0