wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Henri Verbeet : wined3d: Recognize the SM4 NULL register type.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 0677a67c7b1cf4b8439b206ec5e8634ae22a854a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0677a67c7b1cf4b8439b206ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:15 2010 +0200 wined3d: Recognize the SM4 NULL register type. --- dlls/wined3d/shader.c | 10 ++++++++-- dlls/wined3d/shader_sm4.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ac3e911..682188e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1018,6 +1018,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("cb"); break; + case WINED3DSPR_NULL: + TRACE("null"); + break; + default: TRACE("unhandled_rtype(%#x)", reg->type); break; @@ -1044,7 +1048,9 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, } TRACE(")"); } - else if (reg->type != WINED3DSPR_RASTOUT && reg->type != WINED3DSPR_MISCTYPE) + else if (reg->type != WINED3DSPR_RASTOUT + && reg->type != WINED3DSPR_MISCTYPE + && reg->type != WINED3DSPR_NULL) { if (reg->array_idx != ~0U) { @@ -1077,7 +1083,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, shader_dump_register(&param->reg, shader_version); - if (write_mask != WINED3DSP_WRITEMASK_ALL) + if (write_mask && write_mask != WINED3DSP_WRITEMASK_ALL) { static const char *write_mask_chars = "xyzw"; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 0b9d6fd..7ab6c1a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -84,6 +84,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_OUTPUT = 0x2, WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_NULL = 0xd, }; enum wined3d_sm4_immconst_type @@ -156,6 +157,11 @@ static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = /* UNKNOWN */ 0, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; static const struct sysval_map sysval_map[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36b7337..bb719ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -308,6 +308,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, WINED3DSPR_CONSTBUFFER, + WINED3DSPR_NULL, } WINED3DSHADER_PARAM_REGISTER_TYPE; enum wined3d_immconst_type

1 0

Henri Verbeet : wined3d: Allow multiple shader instruction destination arguments.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 7c7205d90aaf0528819b62aabbbed6c1008fa70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7205d90aaf0528819b62aab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:14 2010 +0200 wined3d: Allow multiple shader instruction destination arguments. --- dlls/wined3d/shader.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 854c4ad..ac3e911 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -641,7 +641,7 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct * Relative addressing tokens are ignored, but that's * okay, since we'll catch any address registers when * they are initialized (required by spec). */ - if (ins.dst_count) + for (i = 0; i < ins.dst_count; ++i) { struct wined3d_shader_src_param dst_rel_addr; struct wined3d_shader_dst_param dst_param; @@ -1164,11 +1164,11 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)shader->baseShader.device; const struct wined3d_shader_frontend *fe = shader->baseShader.frontend; void *fe_data = shader->baseShader.frontend_data; + struct wined3d_shader_src_param dst_rel_addr[2]; struct wined3d_shader_src_param src_rel_addr[4]; + struct wined3d_shader_dst_param dst_param[2]; struct wined3d_shader_src_param src_param[4]; struct wined3d_shader_version shader_version; - struct wined3d_shader_src_param dst_rel_addr; - struct wined3d_shader_dst_param dst_param; struct wined3d_shader_instruction ins; struct wined3d_shader_context ctx; const DWORD *ptr = byte_code; @@ -1182,7 +1182,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe ctx.backend_data = backend_ctx; ins.ctx = &ctx; - ins.dst = &dst_param; + ins.dst = dst_param; ins.src = src_param; shader->baseShader.parse_state.current_row = 0; @@ -1221,8 +1221,11 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe continue; } - /* Destination token */ - if (ins.dst_count) fe->shader_read_dst_param(fe_data, &ptr, &dst_param, &dst_rel_addr); + /* Destination tokens */ + for (i = 0; i < ins.dst_count; ++i) + { + fe->shader_read_dst_param(fe_data, &ptr, &dst_param[i], &dst_rel_addr[i]); + } /* Predication token */ if (ins.predicate) @@ -1393,13 +1396,14 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } else { - struct wined3d_shader_src_param dst_rel_addr, src_rel_addr; - struct wined3d_shader_dst_param dst_param; + struct wined3d_shader_src_param dst_rel_addr[2]; + struct wined3d_shader_src_param src_rel_addr; + struct wined3d_shader_dst_param dst_param[2]; struct wined3d_shader_src_param src_param; - if (ins.dst_count) + for (i = 0; i < ins.dst_count; ++i) { - fe->shader_read_dst_param(fe_data, &ptr, &dst_param, &dst_rel_addr); + fe->shader_read_dst_param(fe_data, &ptr, &dst_param[i], &dst_rel_addr[i]); } /* Print out predication source token first - it follows @@ -1438,12 +1442,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE("p"); } - /* We already read the destination token, print it. */ - if (ins.dst_count) + /* We already read the destination tokens, print them. */ + for (i = 0; i < ins.dst_count; ++i) { - shader_dump_ins_modifiers(&dst_param); - TRACE(" "); - shader_dump_dst_param(&dst_param, &shader_version); + shader_dump_ins_modifiers(&dst_param[i]); + TRACE(!i ? " " : ", "); + shader_dump_dst_param(&dst_param[i], &shader_version); } /* Other source tokens */

1 0

Alexandre Julliard : user32: Get rid of the unused icon cache refcount.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: d9ae28926bd56f1c5b34ab7ccf74ccb26e196f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae28926bd56f1c5b34ab7cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 15:09:37 2010 +0200 user32: Get rid of the unused icon cache refcount. --- dlls/user32/cursoricon.c | 31 +------------------------------ 1 files changed, 1 insertions(+), 30 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ec9fd7e..e27365c 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -85,9 +85,6 @@ typedef struct tagICONCACHE HRSRC hRsrc; HRSRC hGroupRsrc; HICON hIcon; - - INT count; - } ICONCACHE; static struct list icon_cache = LIST_INIT( icon_cache ); @@ -412,7 +409,6 @@ static HICON CURSORICON_FindSharedIcon( HMODULE hModule, HRSRC hRsrc ) LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) if ( ptr->hModule == hModule && ptr->hRsrc == hRsrc ) { - ptr->count++; hIcon = ptr->hIcon; break; } @@ -468,7 +464,6 @@ static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroup ptr->hRsrc = hRsrc; ptr->hIcon = hIcon; ptr->hGroupRsrc = hGroupRsrc; - ptr->count = 1; EnterCriticalSection( &IconCrst ); list_add_head( &icon_cache, &ptr->entry ); @@ -476,29 +471,6 @@ static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroup } /********************************************************************** - * CURSORICON_DelSharedIcon - */ -static INT CURSORICON_DelSharedIcon( HICON hIcon ) -{ - INT count = -1; - ICONCACHE *ptr; - - EnterCriticalSection( &IconCrst ); - - LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) - if ( ptr->hIcon == hIcon ) - { - if ( ptr->count > 0 ) ptr->count--; - count = ptr->count; - break; - } - - LeaveCriticalSection( &IconCrst ); - - return count; -} - -/********************************************************************** * get_icon_size */ BOOL get_icon_size( HICON handle, SIZE *size ) @@ -1599,8 +1571,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) { TRACE_(icon)("%p\n", hIcon ); - if (CURSORICON_DelSharedIcon( hIcon ) == -1) - free_icon_handle( hIcon ); + if (!CURSORICON_FindCache( hIcon )) free_icon_handle( hIcon ); return TRUE; }

1 0

Alexandre Julliard : user32: Convert the icon cache to a standard Wine list .
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 975bff627b7dd26df5715e080504f4e80933ae7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=975bff627b7dd26df5715e080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 15:06:16 2010 +0200 user32: Convert the icon cache to a standard Wine list. --- dlls/user32/cursoricon.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index cea5552..ec9fd7e 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -38,6 +38,7 @@ #include "wine/server.h" #include "controls.h" #include "user_private.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); @@ -76,15 +77,10 @@ static const WCHAR DISPLAYW[] = {'D','I','S','P','L','A','Y',0}; /********************************************************************** * ICONCACHE for cursors/icons loaded with LR_SHARED. - * - * FIXME: This should not be allocated on the system heap, but on a - * subsystem-global heap (i.e. one for all Win16 processes, - * and one for each Win32 process). */ typedef struct tagICONCACHE { - struct tagICONCACHE *next; - + struct list entry; HMODULE hModule; HRSRC hRsrc; HRSRC hGroupRsrc; @@ -94,7 +90,7 @@ typedef struct tagICONCACHE } ICONCACHE; -static ICONCACHE *IconAnchor = NULL; +static struct list icon_cache = LIST_INIT( icon_cache ); static CRITICAL_SECTION IconCrst; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -413,7 +409,7 @@ static HICON CURSORICON_FindSharedIcon( HMODULE hModule, HRSRC hRsrc ) EnterCriticalSection( &IconCrst ); - for ( ptr = IconAnchor; ptr; ptr = ptr->next ) + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) if ( ptr->hModule == hModule && ptr->hRsrc == hRsrc ) { ptr->count++; @@ -443,16 +439,15 @@ static ICONCACHE* CURSORICON_FindCache(HICON hIcon) { ICONCACHE *ptr; ICONCACHE *pRet=NULL; - BOOL IsFound = FALSE; EnterCriticalSection( &IconCrst ); - for (ptr = IconAnchor; ptr != NULL && !IsFound; ptr = ptr->next) + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) { if ( hIcon == ptr->hIcon ) { - IsFound = TRUE; pRet = ptr; + break; } } @@ -476,8 +471,7 @@ static void CURSORICON_AddSharedIcon( HMODULE hModule, HRSRC hRsrc, HRSRC hGroup ptr->count = 1; EnterCriticalSection( &IconCrst ); - ptr->next = IconAnchor; - IconAnchor = ptr; + list_add_head( &icon_cache, &ptr->entry ); LeaveCriticalSection( &IconCrst ); } @@ -491,7 +485,7 @@ static INT CURSORICON_DelSharedIcon( HICON hIcon ) EnterCriticalSection( &IconCrst ); - for ( ptr = IconAnchor; ptr; ptr = ptr->next ) + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, ICONCACHE, entry ) if ( ptr->hIcon == hIcon ) { if ( ptr->count > 0 ) ptr->count--;

1 0

Alexandre Julliard : user32/tests: Tests for GetIconInfoExA/W.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 990842a32226388d736c5022d1581ed2df9ef81f URL: http://source.winehq.org/git/wine.git/?a=commit;h=990842a32226388d736c5022d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 13:23:56 2010 +0200 user32/tests: Tests for GetIconInfoExA/W. --- dlls/user32/tests/cursoricon.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index e81e76d..cc00ac0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -65,6 +65,7 @@ static HANDLE child_process; #define PROC_INIT (WM_USER+1) static BOOL (WINAPI *pGetCursorInfo)(CURSORINFO *); +static BOOL (WINAPI *pGetIconInfoExA)(HICON,ICONINFOEXA *); static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -504,6 +505,37 @@ static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_b ok_(__FILE__, line)(bmMask.bmWidth == exp_cx, "bmMask.bmWidth = %d\n", bmMask.bmWidth); ok_(__FILE__, line)(bmMask.bmHeight == exp_cy * 2, "bmMask.bmHeight = %d\n", bmMask.bmHeight); } + if (pGetIconInfoExA) + { + ICONINFOEXA infoex; + + memset( &infoex, 0xcc, sizeof(infoex) ); + SetLastError( 0xdeadbeef ); + infoex.cbSize = sizeof(infoex) - 1; + ret = pGetIconInfoExA( hIcon, &infoex ); + ok_(__FILE__, line)(!ret, "GetIconInfoEx succeeded\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %d\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + infoex.cbSize = sizeof(infoex) + 1; + ret = pGetIconInfoExA( hIcon, &infoex ); + ok_(__FILE__, line)(!ret, "GetIconInfoEx succeeded\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %d\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( (HICON)0xdeadbabe, &infoex ); + ok_(__FILE__, line)(!ret, "GetIconInfoEx succeeded\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INVALID_CURSOR_HANDLE, + "wrong error %d\n", GetLastError()); + + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( hIcon, &infoex ); + ok_(__FILE__, line)(ret, "GetIconInfoEx failed err %d\n", GetLastError()); + ok_(__FILE__, line)(infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID); + ok_(__FILE__, line)(infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName); + ok_(__FILE__, line)(infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName); + } } #define test_icon_info(a,b,c,d) test_icon_info_dbg((a),(b),(c),(d),__LINE__) @@ -889,6 +921,18 @@ static void test_LoadImage(void) ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } + if (pGetIconInfoExA) + { + ICONINFOEXA infoex; + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( handle, &infoex ); + ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); + ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName ); + ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + } + else win_skip( "GetIconInfoEx not available\n" ); + /* Clean up. */ SetLastError(0xdeadbeef); ret = DestroyCursor(handle); @@ -899,6 +943,23 @@ static void test_LoadImage(void) HeapFree(GetProcessHeap(), 0, icon_data); DeleteFileA("icon.ico"); + /* Test a system icon */ + handle = LoadIcon( 0, IDI_HAND ); + ok(handle != NULL, "LoadImage() failed.\n"); + if (pGetIconInfoExA) + { + ICONINFOEXA infoex; + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( handle, &infoex ); + ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + todo_wine ok( infoex.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); + todo_wine ok( GetModuleHandleA(infoex.szModName) == GetModuleHandleA("user32.dll"), + "GetIconInfoEx wrong module %s\n", infoex.szModName ); + ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + } + SetLastError(0xdeadbeef); + DestroyIcon(handle); + test_LoadImageFile("BMP", bmpimage, sizeof(bmpimage), "bmp", 1); test_LoadImageFile("BMP (coreinfo)", bmpcoreimage, sizeof(bmpcoreimage), "bmp", 1); test_LoadImageFile("GIF", gifimage, sizeof(gifimage), "gif", 0); @@ -968,6 +1029,17 @@ static void test_CreateIconFromResource(void) ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } + if (pGetIconInfoExA) + { + ICONINFOEXA infoex; + infoex.cbSize = sizeof(infoex); + ret = pGetIconInfoExA( handle, &infoex ); + ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); + ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName ); + ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + } + /* Clean up. */ SetLastError(0xdeadbeef); ret = DestroyCursor(handle); @@ -1721,6 +1793,7 @@ static void test_DestroyCursor(void) START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); + pGetIconInfoExA = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetIconInfoExA" ); test_argc = winetest_get_mainargs(&test_argv); if (test_argc >= 3)

1 0

Alexandre Julliard : user32: Implemented GetIconInfoExA/W.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: d3de0c265b00c7b7d7fc63b69b3a04a5e855d1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3de0c265b00c7b7d7fc63b69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 13:23:48 2010 +0200 user32: Implemented GetIconInfoExA/W. --- dlls/user32/cursoricon.c | 71 ++++++++++++++++++++++++++++++++++++++++------ dlls/user32/user32.spec | 2 + include/winuser.h | 31 ++++++++++++++++++++ 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ce25a9d..cea5552 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1866,19 +1866,72 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) */ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) { - struct cursoricon_object *ptr; + ICONINFOEXW infoW; + + infoW.cbSize = sizeof(infoW); + if (!GetIconInfoExW( hIcon, &infoW )) return FALSE; + iconinfo->fIcon = infoW.fIcon; + iconinfo->xHotspot = infoW.xHotspot; + iconinfo->yHotspot = infoW.yHotspot; + iconinfo->hbmColor = infoW.hbmColor; + iconinfo->hbmMask = infoW.hbmMask; + return TRUE; +} - if (!(ptr = get_icon_ptr( hIcon ))) return FALSE; +/********************************************************************** + * GetIconInfoExA (USER32.@) + */ +BOOL WINAPI GetIconInfoExA( HICON icon, ICONINFOEXA *info ) +{ + ICONINFOEXW infoW; - TRACE("%p => %dx%d\n", hIcon, ptr->width, ptr->height); + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + infoW.cbSize = sizeof(infoW); + if (!GetIconInfoExW( icon, &infoW )) return FALSE; + info->fIcon = infoW.fIcon; + info->xHotspot = infoW.xHotspot; + info->yHotspot = infoW.yHotspot; + info->hbmColor = infoW.hbmColor; + info->hbmMask = infoW.hbmMask; + info->wResID = infoW.wResID; + WideCharToMultiByte( CP_ACP, 0, infoW.szModName, -1, info->szModName, MAX_PATH, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, infoW.szResName, -1, info->szResName, MAX_PATH, NULL, NULL ); + return TRUE; +} - iconinfo->fIcon = ptr->is_icon; - iconinfo->xHotspot = ptr->hotspot.x; - iconinfo->yHotspot = ptr->hotspot.y; - iconinfo->hbmColor = copy_bitmap( ptr->frames[0].color ); - iconinfo->hbmMask = copy_bitmap( ptr->frames[0].mask ); - release_icon_ptr( hIcon, ptr ); +/********************************************************************** + * GetIconInfoExW (USER32.@) + */ +BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) +{ + struct cursoricon_object *ptr; + + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!(ptr = get_icon_ptr( icon ))) + { + SetLastError( ERROR_INVALID_CURSOR_HANDLE ); + return FALSE; + } + + TRACE("%p => %dx%d\n", icon, ptr->width, ptr->height); + info->fIcon = ptr->is_icon; + info->xHotspot = ptr->hotspot.x; + info->yHotspot = ptr->hotspot.y; + info->hbmColor = copy_bitmap( ptr->frames[0].color ); + info->hbmMask = copy_bitmap( ptr->frames[0].mask ); + info->wResID = 0; /* FIXME */ + info->szModName[0] = 0; /* FIXME */ + info->szResName[0] = 0; /* FIXME */ + release_icon_ptr( icon, ptr ); return TRUE; } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index b5f6d87..072fed4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -290,6 +290,8 @@ @ stdcall GetGUIThreadInfo(long ptr) @ stdcall GetGuiResources(long long) @ stdcall GetIconInfo(long ptr) +@ stdcall GetIconInfoExA(long ptr) +@ stdcall GetIconInfoExW(long ptr) @ stub GetInputDesktop @ stdcall GetInputState() @ stdcall GetInternalWindowPos(long ptr ptr) diff --git a/include/winuser.h b/include/winuser.h index 82d0e2e..9d07ef6 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2107,6 +2107,34 @@ typedef struct _ICONINFO { HBITMAP hbmColor; } ICONINFO, *PICONINFO; +typedef struct _ICONINFOEXA +{ + DWORD cbSize; + BOOL fIcon; + DWORD xHotspot; + DWORD yHotspot; + HBITMAP hbmMask; + HBITMAP hbmColor; + WORD wResID; + CHAR szModName[MAX_PATH]; + CHAR szResName[MAX_PATH]; +} ICONINFOEXA, *PICONINFOEXA; + +typedef struct _ICONINFOEXW +{ + DWORD cbSize; + BOOL fIcon; + DWORD xHotspot; + DWORD yHotspot; + HBITMAP hbmMask; + HBITMAP hbmColor; + WORD wResID; + WCHAR szModName[MAX_PATH]; + WCHAR szResName[MAX_PATH]; +} ICONINFOEXW, *PICONINFOEXW; + +DECL_WINELIB_TYPE_AW(ICONINFOEX); +DECL_WINELIB_TYPE_AW(PICONINFOEX); typedef struct tagCURSORINFO { @@ -4633,6 +4661,9 @@ WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void); WINUSERAPI BOOL WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*); WINUSERAPI BOOL WINAPI GetIconInfo(HICON,PICONINFO); +WINUSERAPI BOOL WINAPI GetIconInfoExA(HICON,ICONINFOEXA*); +WINUSERAPI BOOL WINAPI GetIconInfoExW(HICON,ICONINFOEXW*); +#define GetIconInfoEx WINELIB_NAME_AW(GetIconInfoEx) WINUSERAPI BOOL WINAPI GetInputState(void); WINUSERAPI UINT WINAPI GetInternalWindowPos(HWND,LPRECT,LPPOINT); WINUSERAPI UINT WINAPI GetKBCodePage(void);

1 0

Alexandre Julliard : user32: Make sure the driver CreateCursorIcon() entry point is always called.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: beba1f1586520f7bf2faec8460e1d47cc8d66cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beba1f1586520f7bf2faec846… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 11:23:08 2010 +0200 user32: Make sure the driver CreateCursorIcon() entry point is always called. --- dlls/user32/cursoricon.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 42bba6d..ce25a9d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -940,7 +940,6 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, info->frames[0].mask = mask; info->frames[0].alpha = alpha; release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj ); } else { @@ -1184,6 +1183,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, { POINT hotspot; BITMAPINFO *bmi; + HICON icon; TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", bits, cbSize, dwVersion, width, height, @@ -1205,8 +1205,10 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, bmi = (BITMAPINFO *)(pt + 2); } - return CURSORICON_CreateIconFromBMI( bmi, hotspot, bIcon, dwVersion, + icon = CURSORICON_CreateIconFromBMI( bmi, hotspot, bIcon, dwVersion, width, height, cFlag ); + if (icon) USER_Driver->pCreateCursorIcon( icon ); + return icon; } @@ -1274,6 +1276,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); UnmapViewOfFile( bits ); + if (hIcon) USER_Driver->pCreateCursorIcon( hIcon ); return hIcon; }

1 0

Alexandre Julliard : ntdll: Use the more portable cfsetospeed() function to set serial baud rate.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 4d7ad03c3c3eba7788bae287819eb3c2ba9d080a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7ad03c3c3eba7788bae2878… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 11:21:22 2010 +0200 ntdll: Use the more portable cfsetospeed() function to set serial baud rate. --- dlls/ntdll/serial.c | 105 ++++++++++++--------------------------------------- 1 files changed, 24 insertions(+), 81 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index b52ff22..1ca2cfa 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -143,12 +143,7 @@ static NTSTATUS get_baud_rate(int fd, SERIAL_BAUD_RATE* sbr) ERR("tcgetattr error '%s'\n", strerror(errno)); return FILE_GetNtStatus(); } -#ifndef __EMX__ -#ifdef CBAUD - speed = port.c_cflag & CBAUD; -#else speed = cfgetospeed(&port); -#endif switch (speed) { case B0: sbr->BaudRate = 0; break; @@ -183,9 +178,6 @@ static NTSTATUS get_baud_rate(int fd, SERIAL_BAUD_RATE* sbr) ERR("unknown speed %x\n", speed); return STATUS_INVALID_PARAMETER; } -#else - return STATUS_INVALID_PARAMETER; -#endif return STATUS_SUCCESS; } @@ -429,46 +421,44 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) return FILE_GetNtStatus(); } -#ifdef CBAUD - port.c_cflag &= ~CBAUD; switch (sbr->BaudRate) { - case 0: port.c_cflag |= B0; break; - case 50: port.c_cflag |= B50; break; - case 75: port.c_cflag |= B75; break; - case 110: - case CBR_110: port.c_cflag |= B110; break; - case 134: port.c_cflag |= B134; break; - case 150: port.c_cflag |= B150; break; - case 200: port.c_cflag |= B200; break; - case 300: - case CBR_300: port.c_cflag |= B300; break; + case 0: cfsetospeed( &port, B0 ); break; + case 50: cfsetospeed( &port, B50 ); break; + case 75: cfsetospeed( &port, B75 ); break; + case 110: + case CBR_110: cfsetospeed( &port, B110 ); break; + case 134: cfsetospeed( &port, B134 ); break; + case 150: cfsetospeed( &port, B150 ); break; + case 200: cfsetospeed( &port, B200 ); break; + case 300: + case CBR_300: cfsetospeed( &port, B300 ); break; case 600: - case CBR_600: port.c_cflag |= B600; break; + case CBR_600: cfsetospeed( &port, B600 ); break; case 1200: - case CBR_1200: port.c_cflag |= B1200; break; - case 1800: port.c_cflag |= B1800; break; + case CBR_1200: cfsetospeed( &port, B1200 ); break; + case 1800: cfsetospeed( &port, B1800 ); break; case 2400: - case CBR_2400: port.c_cflag |= B2400; break; + case CBR_2400: cfsetospeed( &port, B2400 ); break; case 4800: - case CBR_4800: port.c_cflag |= B4800; break; + case CBR_4800: cfsetospeed( &port, B4800 ); break; case 9600: - case CBR_9600: port.c_cflag |= B9600; break; + case CBR_9600: cfsetospeed( &port, B9600 ); break; case 19200: - case CBR_19200: port.c_cflag |= B19200; break; + case CBR_19200: cfsetospeed( &port, B19200 ); break; case 38400: - case CBR_38400: port.c_cflag |= B38400; break; + case CBR_38400: cfsetospeed( &port, B38400 ); break; #ifdef B57600 - case 57600: port.c_cflag |= B57600; break; + case 57600: cfsetospeed( &port, B57600 ); break; #endif #ifdef B115200 - case 115200: port.c_cflag |= B115200;break; + case 115200: cfsetospeed( &port, B115200 ); break; #endif #ifdef B230400 - case 230400: port.c_cflag |= B230400;break; + case 230400: cfsetospeed( &port, B230400 ); break; #endif #ifdef B460800 - case 460800: port.c_cflag |= B460800;break; + case 460800: cfsetospeed( &port, B460800 ); break; #endif default: #if defined (HAVE_LINUX_SERIAL_H) && defined (TIOCSSERIAL) @@ -490,7 +480,7 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) "(see man setserial). If you have incapacitated a Hayes type modem,\n" "reset it and it will probably recover.\n", sbr->BaudRate, arby); ioctl(fd, TIOCSSERIAL, &nuts); - port.c_cflag |= B38400; + cfsetospeed( &port, B38400 ); } break; #else /* Don't have linux/serial.h or lack TIOCSSERIAL */ @@ -498,54 +488,7 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) return STATUS_NOT_SUPPORTED; #endif /* Don't have linux/serial.h or lack TIOCSSERIAL */ } -#elif !defined(__EMX__) - switch (sbr->BaudRate) - { - case 0: port.c_ospeed = B0; break; - case 50: port.c_ospeed = B50; break; - case 75: port.c_ospeed = B75; break; - case 110: - case CBR_110: port.c_ospeed = B110; break; - case 134: port.c_ospeed = B134; break; - case 150: port.c_ospeed = B150; break; - case 200: port.c_ospeed = B200; break; - case 300: - case CBR_300: port.c_ospeed = B300; break; - case 600: - case CBR_600: port.c_ospeed = B600; break; - case 1200: - case CBR_1200: port.c_ospeed = B1200; break; - case 1800: port.c_ospeed = B1800; break; - case 2400: - case CBR_2400: port.c_ospeed = B2400; break; - case 4800: - case CBR_4800: port.c_ospeed = B4800; break; - case 9600: - case CBR_9600: port.c_ospeed = B9600; break; - case 19200: - case CBR_19200: port.c_ospeed = B19200; break; - case 38400: - case CBR_38400: port.c_ospeed = B38400; break; -#ifdef B57600 - case 57600: - case CBR_57600: port.c_ospeed = B57600; break; -#endif -#ifdef B115200 - case 115200: - case CBR_115200: port.c_ospeed = B115200;break; -#endif -#ifdef B230400 - case 230400: port.c_ospeed = B230400;break; -#endif -#ifdef B460800 - case 460800: port.c_ospeed = B460800;break; -#endif - default: - ERR("baudrate %d\n", sbr->BaudRate); - return STATUS_NOT_SUPPORTED; - } - port.c_ispeed = port.c_ospeed; -#endif + cfsetispeed( &port, cfgetospeed(&port) ); if (tcsetattr(fd, TCSANOW, &port) == -1) { ERR("tcsetattr error '%s'\n", strerror(errno));

1 0

Austin English : dbghelp: Fix compile on Hurd.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 95740b30b9a76ee3de5353983159ad4cd71df2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95740b30b9a76ee3de5353983… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 8 00:33:52 2010 -0700 dbghelp: Fix compile on Hurd. --- configure | 1 + configure.ac | 1 + dlls/dbghelp/macho_module.c | 6 +++--- include/config.h.in | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a735091..24deb97 100755 --- a/configure +++ b/configure @@ -5798,6 +5798,7 @@ for ac_header in \ linux/types.h \ linux/ucdrom.h \ mach-o/nlist.h \ + mach-o/loader.h \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ diff --git a/configure.ac b/configure.ac index 1a502db..1c0ed46 100644 --- a/configure.ac +++ b/configure.ac @@ -418,6 +418,7 @@ AC_CHECK_HEADERS(\ linux/types.h \ linux/ucdrom.h \ mach-o/nlist.h \ + mach-o/loader.h \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 44fa4f2..9aac3e7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -26,7 +26,7 @@ #include "dbghelp_private.h" -#ifdef __MACH__ +#ifdef HAVE_MACH_O_LOADER_H #include <assert.h> #include <stdarg.h> @@ -1409,7 +1409,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign return ml.macho_info.module; } -#else /* !__MACH__ */ +#else /* HAVE_MACH_O_LOADER_H */ BOOL macho_synchronize_module_list(struct process* pcs) { @@ -1441,4 +1441,4 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) { return FALSE; } -#endif /* __MACH__ */ +#endif /* HAVE_MACH_O_LOADER_H */ diff --git a/include/config.h.in b/include/config.h.in index 98a951f..0bb6be2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -466,6 +466,9 @@ /* Define to 1 if you have the <mach-o/dyld_images.h> header file. */ #undef HAVE_MACH_O_DYLD_IMAGES_H +/* Define to 1 if you have the <mach-o/loader.h> header file. */ +#undef HAVE_MACH_O_LOADER_H + /* Define to 1 if you have the <mach-o/nlist.h> header file. */ #undef HAVE_MACH_O_NLIST_H

1 0

Alexandre Julliard : rpcrt4/tests: Fix a test failure on XP SP3.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 7bfa513bc9892e163060d2af808adadaba948f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfa513bc9892e163060d2af8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 11:12:11 2010 +0200 rpcrt4/tests: Fix a test failure on XP SP3. --- dlls/rpcrt4/tests/ndr_marshall.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 569bd20..549d09e 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1543,6 +1543,9 @@ static void test_conformant_string(void) my_alloc_called = 0; StubMsg.Buffer = StubMsg.BufferStart; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); + /* Windows apparently checks string length on the output buffer to determine its size... */ + memset( mem, 'x', sizeof(memsrc) - 1 ); + mem[sizeof(memsrc) - 1] = 0; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); ok(mem == mem_orig, "mem not alloced\n"); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called);

1 0

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 October 2010