February 2011 - Wine-Commits

Alexandre Julliard : d3dx9_36: Cleanup the fixme_once handling.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 45ead7fe85e7107de91bd79a8ceeb1cb17e4f71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ead7fe85e7107de91bd79a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 23 21:49:13 2011 +0100 d3dx9_36: Cleanup the fixme_once handling. --- dlls/d3dx9_36/surface.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a45349f..1bc2d54 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -604,10 +604,7 @@ static DWORD dword_from_bytes(CONST BYTE *src, UINT bytes_per_pixel) static BOOL fixme_once; if(bytes_per_pixel > sizeof(DWORD)) { - if(!fixme_once) { - FIXME("Unsupported image: %u bytes per pixel\n", bytes_per_pixel); - fixme_once = TRUE; - } + if(!fixme_once++) FIXME("Unsupported image: %u bytes per pixel\n", bytes_per_pixel); bytes_per_pixel = sizeof(DWORD); } @@ -620,10 +617,7 @@ static void dword_to_bytes(BYTE *dst, DWORD dword, UINT bytes_per_pixel) static BOOL fixme_once; if(bytes_per_pixel > sizeof(DWORD)) { - if(!fixme_once++) { - FIXME("Unsupported image: %u bytes per pixel\n", bytes_per_pixel); - fixme_once = TRUE; - } + if(!fixme_once++) FIXME("Unsupported image: %u bytes per pixel\n", bytes_per_pixel); ZeroMemory(dst, bytes_per_pixel); bytes_per_pixel = sizeof(DWORD); }

1 0

Marcus Meissner : msvcrt: Use = instead of == in test (Coverity).
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 706b43f4dd19616eb8a33a36a2da8ac220534255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706b43f4dd19616eb8a33a36a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 23 20:47:32 2011 +0100 msvcrt: Use = instead of == in test (Coverity). --- dlls/msvcrt/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index d93dccf..7135248 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -274,7 +274,7 @@ static void test__get_doserrno(void) errno = EBADF; ret = p_get_doserrno(NULL); ok(ret == EINVAL, "Expected _get_doserrno to return EINVAL, got %d\n", ret); - ok(_doserrno = ERROR_INVALID_CMM, "Expected _doserrno to be ERROR_INVALID_CMM, got %d\n", _doserrno); + ok(_doserrno == ERROR_INVALID_CMM, "Expected _doserrno to be ERROR_INVALID_CMM, got %d\n", _doserrno); ok(errno == EBADF, "Expected errno to be EBADF, got %d\n", errno); _doserrno = ERROR_INVALID_CMM;

1 0

Marcus Meissner : winedump: Remove double assignment (Coverity).
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 372c7fca588f93a7ff67e2f22f3b1b1d22e00839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=372c7fca588f93a7ff67e2f22… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 23 20:45:59 2011 +0100 winedump: Remove double assignment (Coverity). --- tools/winedump/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 950eb59..e56b4aa 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -202,7 +202,7 @@ static const char* full_value_string(const struct full_value* fv) static int numeric_leaf(int* value, const unsigned short int* leaf) { struct full_value fv; - int len = len = full_numeric_leaf(&fv, leaf); + int len = full_numeric_leaf(&fv, leaf); switch (fv.type) {

1 0

Alexandre Julliard : server: Increment the usage count of the global table also when starting a local hook .
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: f0396489e66b6184b483b9c803573cb8869eea61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0396489e66b6184b483b9c80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 23 20:25:05 2011 +0100 server: Increment the usage count of the global table also when starting a local hook. --- server/hook.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/hook.c b/server/hook.c index 7b889d8..7c0ae0f 100644 --- a/server/hook.c +++ b/server/hook.c @@ -497,6 +497,7 @@ DECL_HANDLER(start_hook_chain) { struct hook *hook; struct hook_table *table = get_queue_hooks( current ); + struct hook_table *global_table = get_global_hooks( current ); if (req->id < WH_MINHOOK || req->id > WH_WINEVENT) { @@ -510,9 +511,8 @@ DECL_HANDLER(start_hook_chain) req->window, req->object_id, req->child_id ))) { /* try global table */ - if (!(table = get_global_hooks( current )) || - !(hook = get_first_valid_hook( table, req->id - WH_MINHOOK, req->event, - req->window, req->object_id, req->child_id ))) + if (!global_table || !(hook = get_first_valid_hook( global_table, req->id - WH_MINHOOK, req->event, + req->window, req->object_id, req->child_id ))) return; /* no hook set */ } @@ -529,7 +529,8 @@ DECL_HANDLER(start_hook_chain) reply->proc = hook->proc; reply->handle = hook->handle; reply->unicode = hook->unicode; - table->counts[hook->index]++; + if (table) table->counts[hook->index]++; + if (global_table) global_table->counts[hook->index]++; if (hook->module) set_reply_data( hook->module, hook->module_size ); }

1 0

Maarten Lankhorst : mshtml: Make sure system xpcom dll gets loaded.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: e9a4dee1eb610e567ac4df00368b41282326f03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9a4dee1eb610e567ac4df003… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 23 00:20:33 2011 +0100 mshtml: Make sure system xpcom dll gets loaded. --- dlls/mshtml/nsembed.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9e17bbf..7592b62 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -311,13 +311,17 @@ static void set_environment(LPCWSTR gre_path) static BOOL load_xpcom(const PRUnichar *gre_path) { - static const WCHAR strXPCOM[] = {'x','p','c','o','m','.','d','l','l',0}; + static const WCHAR strXPCOM[] = {'\\','x','p','c','o','m','.','d','l','l',0}; + WCHAR file_name[MAX_PATH]; + + strcpyW(file_name, gre_path); + strcatW(file_name, strXPCOM); - TRACE("(%s)\n", debugstr_w(gre_path)); + TRACE("(%s)\n", debugstr_w(file_name)); set_environment(gre_path); - hXPCOM = LoadLibraryW(strXPCOM); + hXPCOM = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!hXPCOM) { WARN("Could not load XPCOM: %d\n", GetLastError()); return FALSE;

1 0

Alexandre Julliard : winex11: Update the window cursor at most once every 100ms if nothing changed.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: b7987db36f9a9d79ac57d08e1bfd482b238ffcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7987db36f9a9d79ac57d08e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 24 12:14:58 2011 +0100 winex11: Update the window cursor at most once every 100ms if nothing changed. --- dlls/winex11.drv/mouse.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index be55085..794056b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -265,8 +265,12 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned pt->x = data->client_rect.right - data->client_rect.left - 1 - pt->x; MapWindowPoints( hwnd, 0, pt, 1 ); - cursor_window = hwnd; - sync_window_cursor( data ); + if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || + GetTickCount() - last_time_modified > 100) + { + cursor_window = hwnd; + sync_window_cursor( data ); + } if (hwnd != GetDesktopWindow()) hwnd = GetAncestor( hwnd, GA_ROOT ); /* update the wine server Z-order */

1 0

Amine Khaldi : riched20: Add a missing break.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 4b7795a943a868dab5c4a9a3a86d5ec665618351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7795a943a868dab5c4a9a3a… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Wed Feb 23 10:32:03 2011 +0100 riched20: Add a missing break. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index aace0ea..3c409e4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -664,6 +664,7 @@ void ME_RTFParAttrHook(RTF_Info *info) fmt.dyLineSpacing = info->rtfParam; fmt.bLineSpacingRule = 4; } + break; case rtfSpaceMultiply: fmt.dwMask = PFM_LINESPACING; fmt.dyLineSpacing = info->rtfParam * 20;

1 0

Amine Khaldi : d3dcompiler_43: Avoid an unintended fall-through.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: b6990fa77a864ccb6e6b97f83fed55c49fa8ccd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6990fa77a864ccb6e6b97f83… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Wed Feb 23 18:05:12 2011 +0100 d3dcompiler_43: Avoid an unintended fall-through. --- dlls/d3dcompiler_43/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index e265667..362479a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -170,7 +170,7 @@ static const char *get_regname(const struct shader_reg *reg) { case 0: return "vPos"; case 1: return "vFace"; - case 2: return "unexpected misctype"; + default: return "unexpected misctype"; } case BWRITERSPR_LABEL: return wine_dbg_sprintf("l%u", reg->regnum);

1 0

Matteo Bruni : d3dx9: Fix memory access for images with less than 4 bytes per pixel (Valgrind).
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 85a578f7828b7204cb1a8f7cbda929ac9754df13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a578f7828b7204cb1a8f7cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 16 02:39:21 2011 +0100 d3dx9: Fix memory access for images with less than 4 bytes per pixel (Valgrind). --- dlls/d3dx9_36/surface.c | 77 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 61 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 48cd2c2..a45349f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -598,6 +598,39 @@ static void init_argb_conversion_info(CONST PixelFormatDesc *srcformat, CONST Pi } } +static DWORD dword_from_bytes(CONST BYTE *src, UINT bytes_per_pixel) +{ + DWORD ret = 0; + static BOOL fixme_once; + + if(bytes_per_pixel > sizeof(DWORD)) { + if(!fixme_once) { + FIXME("Unsupported image: %u bytes per pixel\n", bytes_per_pixel); + fixme_once = TRUE; + } + bytes_per_pixel = sizeof(DWORD); + } + + memcpy(&ret, src, bytes_per_pixel); + return ret; +} + +static void dword_to_bytes(BYTE *dst, DWORD dword, UINT bytes_per_pixel) +{ + static BOOL fixme_once; + + if(bytes_per_pixel > sizeof(DWORD)) { + if(!fixme_once++) { + FIXME("Unsupported image: %u bytes per pixel\n", bytes_per_pixel); + fixme_once = TRUE; + } + ZeroMemory(dst, bytes_per_pixel); + bytes_per_pixel = sizeof(DWORD); + } + + memcpy(dst, &dword, bytes_per_pixel); +} + /************************************************************ * get_relevant_argb_components * @@ -618,20 +651,21 @@ static void get_relevant_argb_components(CONST struct argb_conversion_info *info * Recombines the output of get_relevant_argb_components and converts * it to the destination format. */ -static void make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD *in, DWORD *out) +static DWORD make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD *in) { UINT i; - *out = 0; + DWORD val = 0; for(i = 0;i < 4;i++) { if(info->process_channel[i]) { /* necessary to make sure that e.g. an X4R4G4B4 white maps to an R8G8B8 white instead of 0xf0f0f0 */ signed int shift; - for(shift = info->destshift[i]; shift > info->destformat->shift[i]; shift -= info->srcformat->bits[i]) *out |= in[i] << shift; - *out |= (in[i] >> (info->destformat->shift[i] - shift)) << info->destformat->shift[i]; + for(shift = info->destshift[i]; shift > info->destformat->shift[i]; shift -= info->srcformat->bits[i]) val |= in[i] << shift; + val |= (in[i] >> (info->destformat->shift[i] - shift)) << info->destformat->shift[i]; } } - *out |= info->channelmask; /* new channels are set to their maximal value */ + val |= info->channelmask; /* new channels are set to their maximal value */ + return val; } /************************************************************ @@ -668,23 +702,29 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, } for(y = 0;y < minheight;y++) { - const BYTE *srcptr = src + y * srcpitch; + const BYTE *srcptr = src + y * srcpitch; BYTE *destptr = dest + y * destpitch; + DWORD val = 0; + for(x = 0;x < minwidth;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(const DWORD*)srcptr, channels); + if(srcformat->type == FORMAT_ARGB) { + pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); + get_relevant_argb_components(&conv_info, pixel, channels); + } /* recombine the components */ - if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); + if(destformat->type == FORMAT_ARGB) val = make_argb_color(&conv_info, channels); if(colorkey) { - get_relevant_argb_components(&ck_conv_info, *(const DWORD*)srcptr, channels); - make_argb_color(&ck_conv_info, channels, &pixel); + get_relevant_argb_components(&ck_conv_info, pixel, channels); + pixel = make_argb_color(&ck_conv_info, channels); if(pixel == colorkey) /* make this pixel transparent */ - *(DWORD *)destptr &= ~conv_info.destmask[0]; + val &= ~conv_info.destmask[0]; } + dword_to_bytes(destptr, val, destformat->bytes_per_pixel); srcptr += srcformat->bytes_per_pixel; destptr += destformat->bytes_per_pixel; } @@ -732,21 +772,26 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsi for(x = 0;x < destsize.x;x++) { const BYTE *srcptr = bufptr + (x * srcsize.x / destsize.x) * srcformat->bytes_per_pixel; + DWORD val = 0; /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(const DWORD*)srcptr, channels); + if(srcformat->type == FORMAT_ARGB) { + pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); + get_relevant_argb_components(&conv_info, pixel, channels); + } /* recombine the components */ - if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); + if(destformat->type == FORMAT_ARGB) val = make_argb_color(&conv_info, channels); if(colorkey) { - get_relevant_argb_components(&ck_conv_info, *(const DWORD*)srcptr, channels); - make_argb_color(&ck_conv_info, channels, &pixel); + get_relevant_argb_components(&ck_conv_info, pixel, channels); + pixel = make_argb_color(&ck_conv_info, channels); if(pixel == colorkey) /* make this pixel transparent */ - *(DWORD *)destptr &= ~conv_info.destmask[0]; + val &= ~conv_info.destmask[0]; } + dword_to_bytes(destptr, val, destformat->bytes_per_pixel); destptr += destformat->bytes_per_pixel; } }

1 0

André Hentschel : odbccp32: Improve some stubs.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: a16b51c62cfeb838828f0f4ff6094c441910d1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16b51c62cfeb838828f0f4ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 22 20:23:07 2011 +0100 odbccp32: Improve some stubs. --- dlls/odbccp32/odbccp32.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index d349203..ba4962d 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -844,26 +844,23 @@ BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + return TRUE; } BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + return TRUE; } BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + return TRUE; } BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN)

1 0