November 2012 - Wine-Commits

Carlos Rafael Ramirez : po: Update Spanish translation.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 010449622c2dd2e7e914aadfe4a757732023aa1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=010449622c2dd2e7e914aadfe… Author: Carlos Rafael Ramirez <crramirez(a)gmail.com> Date: Fri Nov 30 11:28:38 2012 -0600 po: Update Spanish translation. --- po/es.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/es.po b/po/es.po index cc7c935..fee1edc 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-23 09:23+0100\n" +"PO-Revision-Date: 2012-11-30 11:26-0600\n" "Last-Translator: Eduardo García <eduardo.garcia(a)gmx.com>\n" "Language-Team: none\n" "Language: Spanish\n" @@ -3511,10 +3511,8 @@ msgid "" msgstr "" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Crear control" +msgstr "Mandos de juego" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Alexandre Julliard : gdi32: Avoid computing grayscale glyph intensities when not needed.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 2d3385eec93674613a78b037ed751384b505deaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3385eec93674613a78b037e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:24:05 2012 +0100 gdi32: Avoid computing grayscale glyph intensities when not needed. --- dlls/gdi32/dibdrv/dibdrv.h | 4 +- dlls/gdi32/dibdrv/graphics.c | 61 +++++++++++++++-------------------------- dlls/gdi32/dibdrv/objects.c | 32 +++++++++++----------- 3 files changed, 40 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d3385eec93674613a78b…

1 0

Alexandre Julliard : gdi32: Use the faster memset for vertical gradients.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: abdce5c2c818506a56c9dc4a0d9a9e5184ae63d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdce5c2c818506a56c9dc4a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:59:04 2012 +0100 gdi32: Use the faster memset for vertical gradients. --- dlls/gdi32/dibdrv/primitives.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 77ac620..a8270ae 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -4520,7 +4520,7 @@ static BOOL gradient_rect_8888( const dib_info *dib, const RECT *rc, const TRIVE for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride / 4) { DWORD val = gradient_rgb_8888( v, y - v[0].y, v[1].y - v[0].y ); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; + memset_32( ptr, val, rc->right - rc->left ); } break; @@ -4570,7 +4570,7 @@ static BOOL gradient_rect_32( const dib_info *dib, const RECT *rc, const TRIVERT break; case GRADIENT_FILL_RECT_V: - for (y = rc->top; y < rc->bottom; y++) + for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride / 4) { DWORD val = gradient_rgb_24( v, y - v[0].y, v[1].y - v[0].y ); if (dib->red_len == 8 && dib->green_len == 8 && dib->blue_len == 8) @@ -4582,8 +4582,7 @@ static BOOL gradient_rect_32( const dib_info *dib, const RECT *rc, const TRIVERT put_field( val >> 8, dib->green_shift, dib->green_len ) | put_field( val, dib->blue_shift, dib->blue_len )); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; - ptr += dib->stride / 4; + memset_32( ptr, val, rc->right - rc->left ); } break;

1 0

Alexandre Julliard : gdi32: Make blend_subpixel inline.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: d10d95608cd49c5eb3dea152c7f737be8efcc13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10d95608cd49c5eb3dea152c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:23:37 2012 +0100 gdi32: Make blend_subpixel inline. --- dlls/gdi32/dibdrv/primitives.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index bcd2900..77ac620 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5153,7 +5153,7 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in return; } -static DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) { return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 |

1 0

André Hentschel : kernel32/tests: Fix crashes on win8 in console.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 27b0b93684dafa39b799e6056d13c00bde307f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b0b93684dafa39b799e6056… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 27 02:52:46 2012 +0100 kernel32/tests: Fix crashes on win8 in console. --- dlls/kernel32/tests/console.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 4b9cfb6..b1907d7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1354,12 +1354,12 @@ static void test_WriteConsoleInputA(HANDLE input_handle) LPDWORD written; DWORD expected_count; DWORD last_error; - int win7_crash; + int win_crash; } invalid_table[] = { {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, @@ -1367,14 +1367,14 @@ static void test_WriteConsoleInputA(HANDLE input_handle) {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, @@ -1406,7 +1406,7 @@ static void test_WriteConsoleInputA(HANDLE input_handle) for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) { - if (invalid_table[i].win7_crash) + if (invalid_table[i].win_crash) continue; SetLastError(0xdeadbeef); @@ -1597,12 +1597,12 @@ static void test_WriteConsoleInputW(HANDLE input_handle) LPDWORD written; DWORD expected_count; DWORD last_error; - int win7_crash; + int win_crash; } invalid_table[] = { {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, @@ -1610,14 +1610,14 @@ static void test_WriteConsoleInputW(HANDLE input_handle) {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, @@ -1649,7 +1649,7 @@ static void test_WriteConsoleInputW(HANDLE input_handle) for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) { - if (invalid_table[i].win7_crash) + if (invalid_table[i].win_crash) continue; SetLastError(0xdeadbeef);

1 0

Jacek Caban : hhctrl.ocx: Added import library.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 4821b06ed11cbd3e7648c81e884cde4a8abc89d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4821b06ed11cbd3e7648c81e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 11:12:39 2012 +0100 hhctrl.ocx: Added import library. --- .gitignore | 1 + configure | 2 +- configure.ac | 2 +- dlls/hhctrl.ocx/Makefile.in | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dde97a4..036a810 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h dlls/libd3dcompiler.def dlls/libd3dx9.def +dlls/libhtmlhelp.def dlls/libkernel.def dlls/libwinspool.def dlls/libxinput.def diff --git a/configure b/configure index bf5c81c..61f3f9a 100755 --- a/configure +++ b/configure @@ -15497,7 +15497,7 @@ wine_fn_config_dll glu32 enable_glu32 implib wine_fn_config_dll gphoto2.ds enable_gphoto2_ds po wine_fn_config_dll gpkcsp enable_gpkcsp wine_fn_config_dll hal enable_hal -wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx po +wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx implib,po htmlhelp wine_fn_config_dll hid enable_hid implib wine_fn_config_dll hlink enable_hlink implib wine_fn_config_test dlls/hlink/tests hlink_test diff --git a/configure.ac b/configure.ac index 2f1032b..c8a5e0d 100644 --- a/configure.ac +++ b/configure.ac @@ -2703,7 +2703,7 @@ WINE_CONFIG_DLL(glu32,,[implib]) WINE_CONFIG_DLL(gphoto2.ds,,[po]) WINE_CONFIG_DLL(gpkcsp) WINE_CONFIG_DLL(hal) -WINE_CONFIG_DLL(hhctrl.ocx,,[po]) +WINE_CONFIG_DLL(hhctrl.ocx,,[implib,po],[htmlhelp]) WINE_CONFIG_DLL(hid,,[implib]) WINE_CONFIG_DLL(hlink,,[implib]) WINE_CONFIG_TEST(dlls/hlink/tests) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 289cc39..4545bde 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -1,4 +1,5 @@ MODULE = hhctrl.ocx +IMPORTLIB = htmlhelp IMPORTS = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 C_SRCS = \

1 0

Hans Leidekker : advapi32: Export more tracing functions.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: d008771bd24ed8506c0542e773595dee944b0cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d008771bd24ed8506c0542e77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 30 10:43:00 2012 +0100 advapi32: Export more tracing functions. --- dlls/advapi32/advapi32.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0cb3e15..21357fa 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -351,9 +351,9 @@ @ stub GetSiteSidFromToken # @ stub GetThreadWaitChain @ stdcall GetTokenInformation(long long ptr long ptr) -# @ stub GetTraceEnableFlags -# @ stub GetTraceEnableLevel -# @ stub GetTraceLoggerHandle +@ stub GetTraceEnableFlags +@ stub GetTraceEnableLevel +@ stub GetTraceLoggerHandle @ stdcall GetTrusteeFormA(ptr) @ stdcall GetTrusteeFormW(ptr) @ stdcall GetTrusteeNameA(ptr)

1 0

Piotr Caban : msvcp70: Forward bad_cast functions to msvcrt.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: a62158eb2923542b94bc4aeb13632d0f49a60503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62158eb2923542b94bc4aeb1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:50:30 2012 +0000 msvcp70: Forward bad_cast functions to msvcrt. --- dlls/msvcp70/msvcp70.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 401032e..ce079c2 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -447,10 +447,10 @@ @ stub -arch=win64 ??0__non_rtti_object(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0__non_rtti_object(a)std@@QAE(a)PBD@Z @ stub -arch=win64 ??0__non_rtti_object(a)std@@QEAA(a)PEBD@Z -@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z -@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z +@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE(a)ABV0@@Z +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA(a)AEBV0@@Z +@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE(a)PBD@Z +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA(a)PEBD@Z @ stub -arch=win32 ??0bad_typeid(a)std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0bad_typeid(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0bad_typeid(a)std@@QAE(a)PBD@Z @@ -673,8 +673,8 @@ @ cdecl -arch=win64 ??1_Winit(a)std@@QEAA(a)XZ(ptr) msvcp90.??1_Winit(a)std@@QEAA(a)XZ @ stub -arch=win32 ??1__non_rtti_object(a)std@@UAE(a)XZ @ stub -arch=win64 ??1__non_rtti_object(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ(ptr) msvcrt.??1bad_cast@@UAE(a)XZ +@ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_cast@@UEAA(a)XZ @ stub -arch=win32 ??1bad_typeid(a)std@@UAE(a)XZ @ stub -arch=win64 ??1bad_typeid(a)std@@UEAA(a)XZ @ thiscall -arch=win32 ??1codecvt_base(a)std@@UAE(a)XZ(ptr) msvcp90.??1codecvt_base(a)std@@UAE(a)XZ @@ -813,8 +813,8 @@ @ cdecl -arch=win64 ??4_Winit(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcp90.??4_Winit(a)std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??4__non_rtti_object(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4__non_rtti_object(a)std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z +@ cdecl -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0(a)AEBV0@@Z @ stub -arch=win32 ??4bad_typeid(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4bad_typeid(a)std@@QEAAAEAV01(a)AEBV01@@Z @ thiscall -arch=win32 ??4ios_base(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcp90.??4ios_base(a)std@@QAEAAV01(a)ABV01@@Z @@ -1727,8 +1727,8 @@ @ cdecl -arch=win64 ??_F_Locinfo(a)std@@QEAAXXZ(ptr) msvcp90.??_F_Locinfo(a)std@@QEAAXXZ @ thiscall -arch=win32 ??_F_Timevec(a)std@@QAEXXZ(ptr) msvcp90.??_F_Timevec(a)std@@QAEXXZ @ cdecl -arch=win64 ??_F_Timevec(a)std@@QEAAXXZ(ptr) msvcp90.??_F_Timevec(a)std@@QEAAXXZ -@ stub -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ -@ stub -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ +@ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ @ stub -arch=win32 ??_Fbad_typeid(a)std@@QAEXXZ @ stub -arch=win64 ??_Fbad_typeid(a)std@@QEAAXXZ @ thiscall -arch=win32 ??_Fcodecvt_base(a)std@@QAEXXZ(ptr) msvcp90.??_Fcodecvt_base(a)std@@QAEXXZ

1 0

Jacek Caban : jscript: Added disp_delete_name helper and use it in interp_delete.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 466fae6444f26b77c76ddde1fa1c807fe271fb17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466fae6444f26b77c76ddde1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:19 2012 +0100 jscript: Added disp_delete_name helper and use it in interp_delete. --- dlls/jscript/dispex.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 21 +-------------------- dlls/jscript/jscript.h | 1 + 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index d7ff77d..1b7ae50 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1498,6 +1498,49 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) return S_OK; } +HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL *ret) +{ + IDispatchEx *dispex; + jsdisp_t *jsdisp; + HRESULT hres; + + jsdisp = iface_to_jsdisp((IUnknown*)disp); + if(jsdisp) { + dispex_prop_t *prop; + + *ret = TRUE; + hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); + if(prop) + hres = delete_prop(prop); + else + hres = DISP_E_MEMBERNOTFOUND; + + jsdisp_release(jsdisp); + return hres; + } + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + BSTR bstr; + + bstr = SysAllocStringLen(name->str, jsstr_length(name)); + if(bstr) { + hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); + SysFreeString(bstr); + *ret = TRUE; + }else { + hres = E_OUTOFMEMORY; + } + + IDispatchEx_Release(dispex); + }else { + hres = S_OK; + ret = FALSE; + } + + return hres; +} + HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) { dispex_prop_t *prop; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 20791bf..3fedea1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1592,7 +1592,6 @@ static HRESULT interp_mod(exec_ctx_t *ctx) static HRESULT interp_delete(exec_ctx_t *ctx) { jsval_t objv, namev; - IDispatchEx *dispex; IDispatch *obj; jsstr_t *name; BOOL ret; @@ -1617,25 +1616,7 @@ static HRESULT interp_delete(exec_ctx_t *ctx) return hres; } - hres = IDispatch_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - BSTR bstr; - - bstr = SysAllocStringLen(name->str, jsstr_length(name)); - if(bstr) { - hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx->script, fdexNameCaseSensitive)); - SysFreeString(bstr); - ret = TRUE; - }else { - hres = E_OUTOFMEMORY; - } - - IDispatchEx_Release(dispex); - }else { - hres = S_OK; - ret = FALSE; - } - + hres = disp_delete_name(ctx->script, obj, name, &ret); IDispatch_Release(obj); jsstr_release(name); if(FAILED(hres)) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 147cc1a..69ac417 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -276,6 +276,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; +HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*); HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN;

1 0

André Hentschel : kernel32/tests: Fix crash on win8 in module.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 428180ce542cca65a30dfbd36521d9c152b0c296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428180ce542cca65a30dfbd36… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 27 02:52:21 2012 +0100 kernel32/tests: Fix crash on win8 in module. --- dlls/kernel32/tests/module.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index f88c8cb..e8d51e1 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -476,12 +476,16 @@ static void testGetDllDirectory(void) ok(bufferW[0] == 0 || /* XP, 2003 */ broken(bufferW[0] == 'A'), "i=%d, Buffer overflow\n", i); - /* no buffer, but too short length */ - ret = pGetDllDirectoryA(length, NULL); - ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + if (0) + { + /* crashes on win8 */ + /* no buffer, but too short length */ + ret = pGetDllDirectoryA(length, NULL); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); - ret = pGetDllDirectoryW(length, NULL); - ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ret = pGetDllDirectoryW(length, NULL); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + } } /* unset whatever we did so following tests won't be affected */

1 0