wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Nikolay Sivov : shell32: Export lowlevel PIDL manipulation calls by name too.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 45d6329cbb681914219d6752881b94b67974e68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d6329cbb681914219d67528… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 26 03:01:15 2010 +0400 shell32: Export lowlevel PIDL manipulation calls by name too. --- dlls/shell32/pidl.c | 13 +++++++------ dlls/shell32/shell32.spec | 32 ++++++++++++++++---------------- dlls/shell32/tests/shlfolder.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 6f4b082..dffa2bd 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -833,7 +833,7 @@ LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST pidl) } /************************************************************************* - * ILAppend [SHELL32.154] + * ILAppendID [SHELL32.154] * * Adds the single ItemID item to the ItemIDList indicated by pidl. * If bEnd is FALSE, inserts the item in the front of the list, @@ -847,26 +847,27 @@ LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST pidl) * NOTES * Destroys the passed in idlist! (???) */ -LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIST pidl, LPCITEMIDLIST item, BOOL bEnd) +LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST pidl, LPCSHITEMID item, BOOL bEnd) { LPITEMIDLIST idlRet; + LPCITEMIDLIST itemid = (LPCITEMIDLIST)item; WARN("(pidl=%p,pidl=%p,%08u)semi-stub\n",pidl,item,bEnd); pdump (pidl); - pdump (item); + pdump (itemid); if (_ILIsDesktop(pidl)) { - idlRet = ILClone(item); + idlRet = ILClone(itemid); SHFree (pidl); return idlRet; } if (bEnd) - idlRet = ILCombine(pidl, item); + idlRet = ILCombine(pidl, itemid); else - idlRet = ILCombine(item, pidl); + idlRet = ILCombine(itemid, pidl); SHFree(pidl); return idlRet; diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index c398f92..f913872 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -13,17 +13,17 @@ 11 stub -noname PifMgr_SetProperties 13 stub -noname PifMgr_CloseProperties 15 stdcall -noname ILGetDisplayName(ptr ptr) - 16 stdcall -noname ILFindLastID(ptr) - 17 stdcall -noname ILRemoveLastID(ptr) - 18 stdcall -noname ILClone(ptr) - 19 stdcall -noname ILCloneFirst(ptr) + 16 stdcall -ordinal ILFindLastID(ptr) + 17 stdcall -ordinal ILRemoveLastID(ptr) + 18 stdcall -ordinal ILClone(ptr) + 19 stdcall -ordinal ILCloneFirst(ptr) 20 stdcall -noname ILGlobalClone(ptr) - 21 stdcall -noname ILIsEqual(ptr ptr) - 23 stdcall -noname ILIsParent(ptr ptr long) - 24 stdcall -noname ILFindChild(ptr ptr) - 25 stdcall -noname ILCombine(ptr ptr) + 21 stdcall -ordinal ILIsEqual(ptr ptr) + 23 stdcall -ordinal ILIsParent(ptr ptr long) + 24 stdcall -ordinal ILFindChild(ptr ptr) + 25 stdcall -ordinal ILCombine(ptr ptr) 26 stdcall -noname ILLoadFromStream(ptr ptr) - 27 stdcall -noname ILSaveToStream(ptr ptr) + 27 stdcall -ordinal ILSaveToStream(ptr ptr) 28 stdcall -noname SHILCreateFromPath(ptr ptr ptr) SHILCreateFromPathAW 29 stdcall -noname PathIsRoot(ptr) PathIsRootAW 30 stdcall -noname PathBuildRoot(ptr long) PathBuildRootAW @@ -141,12 +141,12 @@ 149 stdcall -noname SHFind_InitMenuPopup(long long long long) 151 stdcall -noname SHLoadOLE(long) - 152 stdcall -noname ILGetSize(ptr) - 153 stdcall -noname ILGetNext(ptr) - 154 stdcall -noname ILAppend(long long long) - 155 stdcall -noname ILFree(ptr) + 152 stdcall -ordinal ILGetSize(ptr) + 153 stdcall -ordinal ILGetNext(ptr) + 154 stdcall -ordinal ILAppendID(long long long) + 155 stdcall -ordinal ILFree(ptr) 156 stdcall -noname ILGlobalFree(ptr) - 157 stdcall -noname ILCreateFromPath(ptr) ILCreateFromPathAW + 157 stdcall -ordinal ILCreateFromPath(ptr) ILCreateFromPathAW 158 stdcall -noname PathGetExtension(str long long) PathGetExtensionAW 159 stdcall -noname PathIsDirectory(ptr) PathIsDirectoryAW 160 stub SHNetConnectionDialog @@ -178,8 +178,8 @@ 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) 187 stub ILGetPseudoNameW 188 stdcall -noname ShellDDEInit(long) - 189 stdcall -noname ILCreateFromPathA(str) - 190 stdcall -noname ILCreateFromPathW(wstr) + 189 stdcall -ordinal ILCreateFromPathA(str) + 190 stdcall -ordinal ILCreateFromPathW(wstr) 191 stdcall -noname SHUpdateImageA(str long long long) 192 stdcall -noname SHUpdateImageW(wstr long long long) 193 stdcall -noname SHHandleUpdateImage(ptr) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f63bf6e..d0055d4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -60,6 +60,7 @@ static void init_function_pointers(void) { HMODULE hmod; HRESULT hr; + void *ptr; hmod = GetModuleHandleA("shell32.dll"); @@ -81,6 +82,33 @@ static void init_function_pointers(void) MAKEFUNC_ORD(ILFree, 155); #undef MAKEFUNC_ORD + /* test named exports */ + ptr = GetProcAddress(hmod, "ILFree"); + ok(broken(ptr == 0) || ptr != 0, "expected named export for ILFree\n"); + if (ptr) + { +#define TESTNAMED(f) \ + ptr = (void*)GetProcAddress(hmod, #f); \ + ok(ptr != 0, "expected named export for " #f "\n"); + + TESTNAMED(ILAppendID); + TESTNAMED(ILClone); + TESTNAMED(ILCloneFirst); + TESTNAMED(ILCombine); + TESTNAMED(ILCreateFromPath); + TESTNAMED(ILCreateFromPathA); + TESTNAMED(ILCreateFromPathW); + TESTNAMED(ILFindChild); + TESTNAMED(ILFindLastID); + TESTNAMED(ILGetNext); + TESTNAMED(ILGetSize); + TESTNAMED(ILIsEqual); + TESTNAMED(ILIsParent); + TESTNAMED(ILRemoveLastID); + TESTNAMED(ILSaveToStream); +#undef TESTNAMED + } + hmod = GetModuleHandleA("shlwapi.dll"); pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW");

1 0

Henri Verbeet : d3d9: Set the FPU control word on device creation.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: e6611e22fb037a879205f1330d1a3485f9f18705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6611e22fb037a879205f1330… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 26 09:41:38 2010 +0200 d3d9: Set the FPU control word on device creation. --- dlls/d3d9/device.c | 15 ++++++++ dlls/d3d9/tests/device.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 68516cc..b9f539e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2822,6 +2822,19 @@ static const IWineD3DDeviceParentVtbl d3d9_wined3d_device_parent_vtbl = device_parent_CreateSwapChain, }; +static void setup_fpu(void) +{ + WORD cw; + +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~0xf3f) | 0x3f; + __asm__ volatile ("fldcw %0" : : "m" (cw)); +#else + FIXME("FPU setup not implemented for this platform.\n"); +#endif +} + HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) { @@ -2833,6 +2846,8 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapte device->device_parent_vtbl = &d3d9_wined3d_device_parent_vtbl; device->ref = 1; + if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); + wined3d_mutex_lock(); hr = IWineD3D_CreateDevice(wined3d, adapter, device_type, focus_window, flags, (IUnknown *)device, (IWineD3DDeviceParent *)&device->device_parent_vtbl, &device->WineD3DDevice); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e21f8ad..2119995 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2641,6 +2641,84 @@ done: UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); } +static inline void set_fpu_cw(WORD cw) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnclex"); + __asm__ volatile ("fldcw %0" : : "m" (cw)); +#endif +} + +static inline WORD get_fpu_cw(void) +{ + WORD cw = 0; +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#endif + return cw; +} + +static void test_fpu_setup(void) +{ + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice9 *device; + HWND window = NULL; + IDirect3D9 *d3d9; + HRESULT hr; + WORD cw; + + d3d9 = pDirect3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a d3d9 object.\n"); + if (!d3d9) return; + + window = CreateWindowA("static", "d3d9_test", WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + if (!window) goto done; + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + if (FAILED(hr)) + { + skip("Failed to create a device, hr %#x.\n", hr); + set_fpu_cw(0x37f); + goto done; + } + + cw = get_fpu_cw(); + ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + + IDirect3DDevice9_Release(device); + + cw = get_fpu_cw(); + ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); + ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + set_fpu_cw(0x37f); + + IDirect3DDevice9_Release(device); + +done: + if (window) DestroyWindow(window); + if (d3d9) IDirect3D9_Release(d3d9); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -2662,6 +2740,9 @@ START_TEST(device) } IDirect3D9_Release(d3d9); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + test_fpu_setup(); +#endif test_multi_device(); test_display_formats(); test_display_modes();

1 0

Henri Verbeet : d3d8: Set the FPU control word on device creation.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 7d5666e084da03fad7f97ab235039d1afd530377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5666e084da03fad7f97ab23… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 26 09:41:37 2010 +0200 d3d8: Set the FPU control word on device creation. --- dlls/d3d8/device.c | 15 ++++++++ dlls/d3d8/tests/device.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2312a6a..12ed0fb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2764,6 +2764,19 @@ static const IWineD3DDeviceParentVtbl d3d8_wined3d_device_parent_vtbl = device_parent_CreateSwapChain, }; +static void setup_fpu(void) +{ + WORD cw; + +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~0xf3f) | 0x3f; + __asm__ volatile ("fldcw %0" : : "m" (cw)); +#else + FIXME("FPU setup not implemented for this platform.\n"); +#endif +} + HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) { @@ -2782,6 +2795,8 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte } device->handle_table.table_size = D3D8_INITIAL_HANDLE_TABLE_SIZE; + if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); + wined3d_mutex_lock(); hr = IWineD3D_CreateDevice(wined3d, adapter, device_type, focus_window, flags, (IUnknown *)device, (IWineD3DDeviceParent *)&device->device_parent_vtbl, &device->WineD3DDevice); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index cd2df9a..b46ec4e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1797,6 +1797,89 @@ done: UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); } +static inline void set_fpu_cw(WORD cw) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnclex"); + __asm__ volatile ("fldcw %0" : : "m" (cw)); +#endif +} + +static inline WORD get_fpu_cw(void) +{ + WORD cw = 0; +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ volatile ("fnstcw %0" : "=m" (cw)); +#endif + return cw; +} + +static void test_fpu_setup(void) +{ + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice8 *device; + D3DDISPLAYMODE d3ddm; + HWND window = NULL; + IDirect3D8 *d3d8; + HRESULT hr; + WORD cw; + + d3d8 = pDirect3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a d3d8 object.\n"); + if (!d3d8) return; + + window = CreateWindowA("static", "d3d8_test", WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + if (!window) goto done; + + hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); + ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); + + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = d3ddm.Format; + + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + if (FAILED(hr)) + { + skip("Failed to create a device, hr %#x.\n", hr); + set_fpu_cw(0x37f); + goto done; + } + + cw = get_fpu_cw(); + ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + + IDirect3DDevice8_Release(device); + + cw = get_fpu_cw(); + ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + set_fpu_cw(0xf60); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); + ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + set_fpu_cw(0x37f); + + IDirect3DDevice8_Release(device); + +done: + if (window) DestroyWindow(window); + if (d3d8) IDirect3D8_Release(d3d8); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -1819,6 +1902,9 @@ START_TEST(device) } IDirect3D8_Release(d3d8); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + test_fpu_setup(); +#endif test_display_modes(); test_shader_versions(); test_swapchain();

1 0

Alexandre Julliard : user32: Copy icon bits by hand in CreateIconIndirect if the bitmaps can' t be selected into a DC.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: e2cb88ec2de717b844c2564e4b0ddc6f09e4e76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cb88ec2de717b844c2564e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 15:57:41 2010 +0200 user32: Copy icon bits by hand in CreateIconIndirect if the bitmaps can't be selected into a DC. --- dlls/user32/cursoricon.c | 59 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1217440..8910985 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1830,6 +1830,43 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) return TRUE; } +/* copy an icon bitmap, even when it can't be selected into a DC */ +/* helper for CreateIconIndirect */ +static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, int dst_height, + HBITMAP src, int width, int height ) +{ + HDC hdc = CreateCompatibleDC( 0 ); + + if (!SelectObject( hdc, src ) || 1) /* do it the hard way */ + { + BITMAPINFO *info; + void *bits; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = height; + info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); + info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = height * get_dib_width_bytes( width, info->bmiHeader.biBitCount ); + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + if (bits && GetDIBits( hdc, src, 0, height, bits, info, DIB_RGB_COLORS )) + StretchDIBits( hdc_dst, dst_x, dst_y, dst_width, dst_height, + 0, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, info ); + } + else StretchBlt( hdc_dst, dst_x, dst_y, dst_width, dst_height, hdc, 0, 0, width, height, SRCCOPY ); + + DeleteDC( hdc ); +} + /********************************************************************** * CreateIconIndirect (USER32.@) */ @@ -1839,7 +1876,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) HICON hObj; HBITMAP color = 0, mask; int width, height; - HDC src, dst; + HDC hdc; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", iconinfo->hbmColor, iconinfo->hbmMask, @@ -1875,28 +1912,22 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) mask = CreateBitmap( width, height, 1, 1, NULL ); } - src = CreateCompatibleDC( 0 ); - dst = CreateCompatibleDC( 0 ); - - SelectObject( src, iconinfo->hbmMask ); - SelectObject( dst, mask ); - StretchBlt( dst, 0, 0, width, height, src, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, SRCCOPY ); + hdc = CreateCompatibleDC( 0 ); + SelectObject( hdc, mask ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmMask, bmpAnd.bmWidth, bmpAnd.bmHeight ); if (color) { - SelectObject( src, iconinfo->hbmColor ); - SelectObject( dst, color ); - BitBlt( dst, 0, 0, width, height, src, 0, 0, SRCCOPY ); + SelectObject( hdc, color ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmColor, width, height ); } else if (iconinfo->hbmColor) { - SelectObject( src, iconinfo->hbmColor ); - BitBlt( dst, 0, height, width, height, src, 0, 0, SRCCOPY ); + stretch_blt_icon( hdc, 0, height, width, height, iconinfo->hbmColor, width, height ); } else height /= 2; - DeleteDC( src ); - DeleteDC( dst ); + DeleteDC( hdc ); hObj = alloc_icon_handle(); if (hObj)

1 0

Alexandre Julliard : comctl32/imagelist: Fix a copy/ paste typo in ImageList_Merge.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: f90b6d5af634dd5c93fd5d054c7c44b3057c90c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90b6d5af634dd5c93fd5d054… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 17:36:23 2010 +0200 comctl32/imagelist: Fix a copy/paste typo in ImageList_Merge. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 7ca1fc9..d67672f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2037,7 +2037,7 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, if (himlDst) { imagelist_point_from_index( himl1, i1, &pt1 ); - imagelist_point_from_index( himl1, i2, &pt2 ); + imagelist_point_from_index( himl2, i2, &pt2 ); /* copy image */ BitBlt (himlDst->hdcImage, 0, 0, cxDst, cyDst, himl1->hdcImage, 0, 0, BLACKNESS);

1 0

Alexandre Julliard : comctl32/imagelist: Add support for 25% and 50% blending when using an alpha channel.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 5572fc57ef6e60c69bc885f6fd2110c14a4f13cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5572fc57ef6e60c69bc885f6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 15:39:17 2010 +0200 comctl32/imagelist: Add support for 25% and 50% blending when using an alpha channel. --- dlls/comctl32/imagelist.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 11ff27f..7ca1fc9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1157,7 +1157,8 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, - int src_x, int src_y, int cx, int cy, BLENDFUNCTION func ) + int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, + UINT style, COLORREF blend_col ) { BOOL ret = FALSE; HDC hdc; @@ -1184,6 +1185,30 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des SelectObject( hdc, bmp ); BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); + if (blend_col != CLR_NONE) + { + BYTE r = GetRValue( blend_col ); + BYTE g = GetGValue( blend_col ); + BYTE b = GetBValue( blend_col ); + + if (style & ILD_BLEND25) + { + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + *ptr = ((*ptr & 0xff000000) | + ((((*ptr & 0x00ff0000) * 3 + (r << 16)) / 4) & 0x00ff0000) | + ((((*ptr & 0x0000ff00) * 3 + (g << 8)) / 4) & 0x0000ff00) | + ((((*ptr & 0x000000ff) * 3 + (b << 0)) / 4) & 0x000000ff)); + } + else if (style & ILD_BLEND50) + { + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + *ptr = ((*ptr & 0xff000000) | + ((((*ptr & 0x00ff0000) + (r << 16)) / 2) & 0x00ff0000) | + ((((*ptr & 0x0000ff00) + (g << 8)) / 2) & 0x0000ff00) | + ((((*ptr & 0x000000ff) + (b << 0)) / 2) & 0x000000ff)); + } + } + if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ { /* pre-multiply by the alpha channel */ @@ -1302,9 +1327,16 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); if (!bMask && (has_alpha || (fState & ILS_ALPHA))) { - COLORREF colour; + COLORREF colour, blend_col = CLR_NONE; BLENDFUNCTION func; + if (bBlend) + { + blend_col = pimldp->rgbFg; + if (blend_col == CLR_DEFAULT) blend_col = GetSysColor( COLOR_HIGHLIGHT ); + else if (blend_col == CLR_NONE) blend_col = GetTextColor( pimldp->hdcDst ); + } + func.BlendOp = AC_SRC_OVER; func.BlendFlags = 0; func.SourceConstantAlpha = (fState & ILS_ALPHA) ? pimldp->Frame : 255; @@ -1313,7 +1345,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (bIsTransparent) { bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, func ); + pt.x, pt.y, cx, cy, func, fStyle, blend_col ); goto end; } colour = pimldp->rgbBk; @@ -1322,7 +1354,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end;

1 0

Alexandre Julliard : user32: Check the active window instead of the foreground to show/ hide owned popups.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 7ea98f680d051aeda02705d1520e4d636cc181b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea98f680d051aeda02705d15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 10:39:01 2010 +0200 user32: Check the active window instead of the foreground to show/hide owned popups. --- dlls/user32/nonclient.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index c8d19d9..a685370 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1548,19 +1548,19 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) break; case SC_MINIMIZE: - if (hwnd == GetForegroundWindow()) + if (hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,FALSE); ShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_RESTORE ); break;

1 0

Gerald Pfeifer : wordpad: Remove variable bottom which is not really used from print.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: f26b4f68e74b20995521f5c805062b1d70026614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26b4f68e74b20995521f5c80… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 22:09:16 2010 +0200 wordpad: Remove variable bottom which is not really used from print. --- programs/wordpad/print.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 226052e..1d4e6e3 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -487,7 +487,6 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) StartDocW(fr.hdc, &di); do { - int bottom = fr.rc.bottom; if(StartPage(fr.hdc) <= 0) break; @@ -495,7 +494,6 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) if(EndPage(fr.hdc) <= 0) break; - bottom = fr.rc.bottom; printedPages++; if((pd->Flags & PD_PAGENUMS) && (printedPages > (pd->nToPage - pd->nFromPage)))

1 0

Gerald Pfeifer : dbghelp: Remove variable basic_block which is not really used from dwarf2_parse_line_numbers .
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 72216a604d46037906fe087e2d67face21acdc49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72216a604d46037906fe087e2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 22:15:41 2010 +0200 dbghelp: Remove variable basic_block which is not really used from dwarf2_parse_line_numbers. --- dlls/dbghelp/dwarf.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4be0f6a..35c01a6 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2003,7 +2003,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, unsigned file = 1; unsigned line = 1; unsigned is_stmt = default_stmt; - BOOL basic_block = FALSE, end_sequence = FALSE; + BOOL end_sequence = FALSE; unsigned opcode, extopcode, i; while (!end_sequence) @@ -2017,7 +2017,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, address += (delta / line_range) * insn_size; line += line_base + (delta % line_range); - basic_block = TRUE; dwarf2_set_line_number(ctx->module, address, &files, file, line); } else @@ -2025,7 +2024,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, switch (opcode) { case DW_LNS_copy: - basic_block = FALSE; dwarf2_set_line_number(ctx->module, address, &files, file, line); break; case DW_LNS_advance_pc: @@ -2044,7 +2042,6 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, is_stmt = !is_stmt; break; case DW_LNS_set_basic_block: - basic_block = 1; break; case DW_LNS_const_add_pc: address += ((255 - opcode_base) / line_range) * insn_size;

1 0

Gerald Pfeifer : rsaenh: Simplify store_key_container_permissions.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: c8748d73d16e511e70a0065be50e82f425d66d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8748d73d16e511e70a0065be… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon May 24 21:43:15 2010 +0200 rsaenh: Simplify store_key_container_permissions. --- dlls/rsaenh/rsaenh.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 89bb786..d7d63b1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1167,16 +1167,6 @@ static void store_key_container_keys(KEYCONTAINER *pKeyContainer) static void store_key_container_permissions(KEYCONTAINER *pKeyContainer) { HKEY hKey; - DWORD dwFlags; - - /* On WinXP, persistent keys are stored in a file located at: - * $AppData$\\Microsoft\\Crypto\\RSA\\$SID$\\some_hex_string - */ - - if (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET) - dwFlags = CRYPTPROTECT_LOCAL_MACHINE; - else - dwFlags = 0; if (create_container_key(pKeyContainer, KEY_WRITE, &hKey)) {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
96
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 May 2010