December 2009 - Wine-Commits

Rob Shearman : jscript: Fix various memory and reference count leaks.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 9dc584d0a2cae7cfb4816fe982071d264d2345ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc584d0a2cae7cfb4816fe98… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Dec 31 12:03:01 2009 +0000 jscript: Fix various memory and reference count leaks. --- dlls/jscript/array.c | 4 +++- dlls/jscript/dispex.c | 2 ++ dlls/jscript/engine.c | 22 ++++++++++++++++++++-- dlls/jscript/error.c | 1 + dlls/jscript/function.c | 1 + dlls/jscript/parser.y | 1 + dlls/jscript/regexp.c | 5 ++++- dlls/jscript/string.c | 3 ++- 8 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 8ce35cf..873ab6e 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -586,8 +586,10 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA if(hres == DISP_E_UNKNOWNNAME) continue; - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { hres = jsdisp_propput_idx(arr, idx-start, &v, ei, sp); + VariantClear(&v); + } if(FAILED(hres)) { jsdisp_release(arr); diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index d0a328e..1b52ba4 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -473,6 +473,8 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) } heap_free(This->props); script_release(This->ctx); + if(This->prototype) + jsdisp_release(This->prototype); if(This->builtin_info->destructor) This->builtin_info->destructor(This); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 653aca3..b40a88e 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1412,11 +1412,15 @@ HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, exprval_release(&exprval); } - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { hres = to_object(ctx->parser->script, &member, &obj); + if(FAILED(hres)) + VariantClear(&val); + } VariantClear(&member); if(SUCCEEDED(hres)) { hres = to_string(ctx->parser->script, &val, ei, &str); + VariantClear(&val); if(SUCCEEDED(hres)) { if(flags & EXPR_STRREF) { ret->type = EXPRVAL_NAMEREF; @@ -1426,6 +1430,7 @@ HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, } hres = disp_get_id(ctx->parser->script, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); + SysFreeString(str); } if(SUCCEEDED(hres)) { @@ -1569,6 +1574,7 @@ HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j hres = disp_call(ctx->parser->script, V_DISPATCH(&constr), DISPID_VALUE, DISPATCH_CONSTRUCT, &dp, &var, ei, NULL/*FIXME*/); IDispatch_Release(V_DISPATCH(&constr)); + free_dp(&dp); if(FAILED(hres)) return hres; @@ -2490,6 +2496,7 @@ HRESULT plus_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, return hres; hres = to_number(ctx->parser->script, &val, ei, &num); + VariantClear(&val); if(FAILED(hres)) return hres; @@ -2749,6 +2756,8 @@ HRESULT equal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, return hres; hres = equal_values(ctx, &rval, &lval, ei, &b); + VariantClear(&lval); + VariantClear(&rval); if(FAILED(hres)) return hres; @@ -2770,6 +2779,8 @@ HRESULT equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return hres; hres = equal2_values(&rval, &lval, &b); + VariantClear(&lval); + VariantClear(&rval); if(FAILED(hres)) return hres; @@ -2791,6 +2802,8 @@ HRESULT not_equal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fl return hres; hres = equal_values(ctx, &lval, &rval, ei, &b); + VariantClear(&lval); + VariantClear(&rval); if(FAILED(hres)) return hres; @@ -2812,6 +2825,8 @@ HRESULT not_equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return hres; hres = equal2_values(&lval, &rval, &b); + VariantClear(&lval); + VariantClear(&rval); if(FAILED(hres)) return hres; @@ -3114,8 +3129,11 @@ HRESULT assign_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags exprval_release(&exprvalr); } - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { hres = put_value(ctx->parser->script, &exprval, &rval, ei); + if(FAILED(hres)) + VariantClear(&rval); + } exprval_release(&exprval); if(FAILED(hres)) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index d8503f1..e3cfce6 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -330,6 +330,7 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, DISPPARAMS *dp, hres = create_error(ctx, constr, NULL, msg, &err); else hres = create_error(ctx, constr, &num, msg, &err); + SysFreeString(msg); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 4f4a87f..d25fd0f 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -213,6 +213,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = create_exec_ctx(ctx, this_obj, var_disp, scope, &exec_ctx); scope_release(scope); } + jsdisp_release(var_disp); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index cc9097d..f062cd0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1583,6 +1583,7 @@ void parser_release(parser_ctx_t *ctx) if(--ctx->ref) return; + script_release(ctx->script); heap_free(ctx->begin); jsheap_free(&ctx->heap); heap_free(ctx); diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 05b6062..1034cd0 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3667,8 +3667,11 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, VARIANT *arg, jsexce *ret = VARIANT_FALSE; } - if(input) + if(input) { *input = string; + }else { + SysFreeString(string); + } return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 95ad773..63c0fe8 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -703,6 +703,7 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP break; } + heap_free(match_result); SysFreeString(val_str); if(SUCCEEDED(hres) && retv) { @@ -795,7 +796,7 @@ static HRESULT rep_call(script_ctx_t *ctx, DispatchEx *func, const WCHAR *str, m if(SUCCEEDED(hres)) hres = jsdisp_call_value(func, DISPATCH_METHOD, &dp, &var, ei, caller); - for(i=0; i < parens_cnt+1; i++) { + for(i=0; i < parens_cnt+3; i++) { if(i != parens_cnt+1) SysFreeString(V_BSTR(get_arg(&dp,i))); }

1 0

Christian Costa : d3drm: Add stub for Direct3DRMCreate.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: e54b46021d0d69cf251acb692b16dd5b35127467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54b46021d0d69cf251acb692… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Dec 31 09:28:15 2009 +0100 d3drm: Add stub for Direct3DRMCreate. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/d3drm_main.c | 15 +++++++++++++++ include/d3drm.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 141f933..4efb9ee 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -18,6 +18,6 @@ @ stdcall D3DRMVectorRotate(ptr ptr ptr long) @ stdcall D3DRMVectorScale(ptr ptr long) @ stdcall D3DRMVectorSubtract(ptr ptr ptr) -@ stub Direct3DRMCreate +@ stdcall Direct3DRMCreate(ptr) @ stub DllCanUnloadNow @ stub DllGetClassObject diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 5daa042..a9b3e89 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -19,6 +19,11 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "d3drm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3drm); /*********************************************************************** * DllMain (D3DRM.@) @@ -35,3 +40,13 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } return TRUE; } + +/*********************************************************************** + * (D3DRM.@) + */ +HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM) +{ + FIXME("(%p): stub!\n", ppDirect3DRM); + + return D3DRMERR_INVALIDLIBRARY; +} diff --git a/include/d3drm.h b/include/d3drm.h index 4ee4354..c519d86 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -31,4 +31,42 @@ DEFINE_GUID(IID_IDirect3DRM, 0x2bc49361, 0x8327, 0x11cf, 0xac, 0x DEFINE_GUID(IID_IDirect3DRM2, 0x4516ecc8, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); DEFINE_GUID(IID_IDirect3DRM3, 0x4516ec83, 0x8f20, 0x11d0, 0x9b, 0x6d, 0x00, 0x00, 0xc0, 0x78, 0x1b, 0xc3); +typedef void *LPDIRECT3DRM; + +HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM); + +#define D3DRM_OK DD_OK +#define D3DRMERR_BADOBJECT MAKE_DDHRESULT(781) +#define D3DRMERR_BADTYPE MAKE_DDHRESULT(782) +#define D3DRMERR_BADALLOC MAKE_DDHRESULT(783) +#define D3DRMERR_FACEUSED MAKE_DDHRESULT(784) +#define D3DRMERR_NOTFOUND MAKE_DDHRESULT(785) +#define D3DRMERR_NOTDONEYET MAKE_DDHRESULT(786) +#define D3DRMERR_FILENOTFOUND MAKE_DDHRESULT(787) +#define D3DRMERR_BADFILE MAKE_DDHRESULT(788) +#define D3DRMERR_BADDEVICE MAKE_DDHRESULT(789) +#define D3DRMERR_BADVALUE MAKE_DDHRESULT(790) +#define D3DRMERR_BADMAJORVERSION MAKE_DDHRESULT(791) +#define D3DRMERR_BADMINORVERSION MAKE_DDHRESULT(792) +#define D3DRMERR_UNABLETOEXECUTE MAKE_DDHRESULT(793) +#define D3DRMERR_LIBRARYNOTFOUND MAKE_DDHRESULT(794) +#define D3DRMERR_INVALIDLIBRARY MAKE_DDHRESULT(795) +#define D3DRMERR_PENDING MAKE_DDHRESULT(796) +#define D3DRMERR_NOTENOUGHDATA MAKE_DDHRESULT(797) +#define D3DRMERR_REQUESTTOOLARGE MAKE_DDHRESULT(798) +#define D3DRMERR_REQUESTTOOSMALL MAKE_DDHRESULT(799) +#define D3DRMERR_CONNECTIONLOST MAKE_DDHRESULT(800) +#define D3DRMERR_LOADABORTED MAKE_DDHRESULT(801) +#define D3DRMERR_NOINTERNET MAKE_DDHRESULT(802) +#define D3DRMERR_BADCACHEFILE MAKE_DDHRESULT(803) +#define D3DRMERR_BOXNOTSET MAKE_DDHRESULT(804) +#define D3DRMERR_BADPMDATA MAKE_DDHRESULT(805) +#define D3DRMERR_CLIENTNOTREGISTERED MAKE_DDHRESULT(806) +#define D3DRMERR_NOTCREATEDFROMDDS MAKE_DDHRESULT(807) +#define D3DRMERR_NOSUCHKEY MAKE_DDHRESULT(808) +#define D3DRMERR_INCOMPATABLEKEY MAKE_DDHRESULT(809) +#define D3DRMERR_ELEMENTINUSE MAKE_DDHRESULT(810) +#define D3DRMERR_TEXTUREFORMATNOTFOUND MAKE_DDHRESULT(811) +#define D3DRMERR_NOTAGGREGATED MAKE_DDHRESULT(812) + #endif /* __D3DRM_H__ */

1 0

Ilya Shpigor : gdi32: Test for font creation with the OEM charset.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: f91d61a529bc730f71f9745e1856420ce8c6a266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91d61a529bc730f71f9745e1… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Wed Dec 30 13:44:21 2009 +0300 gdi32: Test for font creation with the OEM charset. --- dlls/gdi32/tests/font.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 60c42a1..904f0d0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2845,6 +2845,29 @@ static void test_orientation(void) DeleteDC(hdc); } +static void test_oemcharset(void) +{ + HDC hdc; + LOGFONTA lf; + HFONT hfont, old_hfont; + int charset; + + hdc = CreateCompatibleDC(0); + ZeroMemory(&lf, sizeof(lf)); + lf.lfHeight = 12; + lf.lfCharSet = OEM_CHARSET; + lf.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; + lstrcpyA(lf.lfFaceName, "Terminal"); + hfont = CreateFontIndirectA(&lf); + old_hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); +todo_wine + ok(charset == OEM_CHARSET, "expected %d charset, got %d\n", OEM_CHARSET, charset); + SelectObject(hdc, old_hfont); + DeleteObject(hfont); + DeleteDC(hdc); +} + static void test_GetGlyphOutline(void) { MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; @@ -3054,4 +3077,5 @@ START_TEST(font) test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); test_CreateFontIndirect(); + test_oemcharset(); }

1 0

Aaron Brazener : wined3d: Added further Nvidia Geforce 8xxx detection.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 11754a645b96077ae449cdddc2972eda6797ef1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11754a645b96077ae449cdddc… Author: Aaron Brazener <rnbrznr(a)gmail.com> Date: Wed Dec 30 13:10:25 2009 +0000 wined3d: Added further Nvidia Geforce 8xxx detection. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 713a349..f9bc752 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1288,7 +1288,9 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * } /* Geforce8 - lowend */ - if (strstr(gl_renderer, "8300") + if (strstr(gl_renderer, "8100") + || strstr(gl_renderer, "8200") + || strstr(gl_renderer, "8300") || strstr(gl_renderer, "8400") || strstr(gl_renderer, "8500")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b98ba10..47b89c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1297,7 +1297,11 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */ CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, + CARD_NVIDIA_GEFORCE_8100 = 0x084F, + CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084B */ CARD_NVIDIA_GEFORCE_8300GS = 0x0423, + CARD_NVIDIA_GEFORCE_8400GS = 0x0404, + CARD_NVIDIA_GEFORCE_8500GT = 0x0421, CARD_NVIDIA_GEFORCE_8600GT = 0x0402, CARD_NVIDIA_GEFORCE_8600MGT = 0x0407, CARD_NVIDIA_GEFORCE_8800GTS = 0x0193,

1 0

Michael Stefaniuc : kernel32: Add missing stdarg.h includes.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 4f60b6bf91f1bf797a37bc860732c79a1ff813fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f60b6bf91f1bf797a37bc860… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 30 23:36:56 2009 +0100 kernel32: Add missing stdarg.h includes. --- dlls/kernel32/module.c | 1 + dlls/kernel32/process.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index aaa5551..ff3c3a5 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <fcntl.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e481e0c..92d645c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -25,6 +25,7 @@ #include <ctype.h> #include <errno.h> #include <signal.h> +#include <stdarg.h> #include <stdio.h> #include <time.h> #ifdef HAVE_SYS_TIME_H

1 0

Andrew Nguyen : wine.inf: Add PATHEXT system environment variable.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 0d61dd8c8697078001fc1a7902bd17bb8fb42908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d61dd8c8697078001fc1a790… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 30 20:47:22 2009 -0600 wine.inf: Add PATHEXT system environment variable. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 6cec46a..cb33038 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -455,6 +455,7 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc [Environment] HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%"

1 0

Andrew Nguyen : cmd: Set the PROMPT environment variable on startup.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: f06cb3e6c06a8e40e0e42d543fc94fa1036a9ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06cb3e6c06a8e40e0e42d543… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Dec 30 20:47:32 2009 -0600 cmd: Set the PROMPT environment variable on startup. --- programs/cmd/wcmdmain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0e25deb..5f3a0ca 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2189,6 +2189,8 @@ int wmain (int argc, WCHAR *argvW[]) int opt_t = 0; static const WCHAR autoexec[] = {'\\','a','u','t','o','e','x','e','c','.', 'b','a','t','\0'}; + static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; + static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; char ansiVersion[100]; CMD_LIST *toExecute = NULL; /* Commands left to be executed */ @@ -2521,6 +2523,7 @@ int wmain (int argc, WCHAR *argvW[]) * Loop forever getting commands and executing them. */ + SetEnvironmentVariableW(promptW, defaultpromptW); WCMD_version (); while (TRUE) {

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for KeGetCurrentThread/ PsGetCurrentThread.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: dd5abc2dcf30a4be74bb03e4e1658778fcac3b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5abc2dcf30a4be74bb03e4e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Dec 30 11:02:01 2009 +0100 ntoskrnl.exe: Add stub for KeGetCurrentThread/PsGetCurrentThread. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/wdm.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7b25dd7..fcb7bea 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -961,6 +961,15 @@ NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING Redi } /*********************************************************************** + * KeGetCurrentThread / PsGetCurrentThread (NTOSKRNL.EXE.@) + */ +PRKTHREAD WINAPI KeGetCurrentThread(void) +{ + FIXME("() stub\n"); + return NULL; +} + +/*********************************************************************** * KeInitializeEvent (NTOSKRNL.EXE.@) */ void WINAPI KeInitializeEvent( PRKEVENT Event, EVENT_TYPE Type, BOOLEAN State ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b319e2e..6fc72c1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -529,7 +529,7 @@ @ stub KeFindConfigurationNextEntry @ stub KeFlushEntireTb @ stub KeFlushQueuedDpcs -@ stub KeGetCurrentThread +@ stdcall KeGetCurrentThread() @ stub KeGetPreviousMode @ stub KeGetRecommendedSharedDataAlignment @ stub KeI386AbiosCall @@ -852,7 +852,7 @@ @ stub PsGetCurrentProcess @ stdcall PsGetCurrentProcessId() @ stub PsGetCurrentProcessSessionId -@ stub PsGetCurrentThread +@ stdcall PsGetCurrentThread() KeGetCurrentThread @ stdcall PsGetCurrentThreadId() @ stub PsGetCurrentThreadPreviousMode @ stub PsGetCurrentThreadStackBase diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3a8af73..a382294 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -134,7 +134,7 @@ typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; typedef struct _FREE_FUNCTION *PFREE_FUNCTION; -typedef struct _KTHREAD *PKTHREAD; +typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD; typedef struct _EPROCESS *PEPROCESS; typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM;

1 0

Joel Holdsworth : user32: Fixed icons to select correct image in high colour depth.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 95ac10e526f9949802c8b76a969a942a9a4c2727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ac10e526f9949802c8b76a9… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Dec 30 20:00:08 2009 +0000 user32: Fixed icons to select correct image in high colour depth. --- dlls/user32/cursoricon.c | 68 +++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 188500a..9a36499 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -468,10 +468,10 @@ typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, /********************************************************************** * CURSORICON_FindBestIcon * - * Find the icon closest to the requested size and number of colors. + * Find the icon closest to the requested size and bit depth. */ static int CURSORICON_FindBestIcon( LPVOID dir, fnGetCIEntry get_entry, - int width, int height, int colors ) + int width, int height, int depth ) { int i, cx, cy, bits, bestEntry = -1; UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; @@ -498,7 +498,7 @@ static int CURSORICON_FindBestIcon( LPVOID dir, fnGetCIEntry get_entry, { if(abs(width - cx) == iXDiff && abs(height - cy) == iYDiff) { - iTempColorDiff = abs(colors - (1<<bits)); + iTempColorDiff = abs(depth - bits); if(iColorDiff > iTempColorDiff) { bestEntry = i; @@ -533,7 +533,7 @@ static BOOL CURSORICON_GetResIconEntry( LPVOID dir, int n, * FIXME: parameter 'color' ignored. */ static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, - int width, int height, int color ) + int width, int height, int depth ) { int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; @@ -588,22 +588,22 @@ static BOOL CURSORICON_GetResCursorEntry( LPVOID dir, int n, } static CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( CURSORICONDIR * dir, - int width, int height, int colors ) + int width, int height, int depth ) { int n; n = CURSORICON_FindBestIcon( dir, CURSORICON_GetResIconEntry, - width, height, colors ); + width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } static CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( CURSORICONDIR *dir, - int width, int height, int color ) + int width, int height, int depth ) { int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetResCursorEntry, - width, height, color ); + width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; @@ -625,20 +625,20 @@ static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, } static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, - int width, int height, int color ) + int width, int height, int depth ) { int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetFileEntry, - width, height, color ); + width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *dir, - int width, int height, int color ) + int width, int height, int depth ) { int n = CURSORICON_FindBestIcon( dir, CURSORICON_GetFileEntry, - width, height, color ); + width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; @@ -964,7 +964,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ * \- CHUNK:icon */ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, - INT width, INT height, INT colors ) + INT width, INT height, INT depth ) { HCURSOR cursor; ani_header header = {0}; @@ -1017,7 +1017,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, icon_data = fram_chunk.data + (2 * sizeof(DWORD)); entry = CURSORICON_FindBestIconFile( (CURSORICONFILEDIR *) icon_data, - width, height, colors ); + width, height, depth ); frame_bits = HeapAlloc( GetProcessHeap(), 0, entry->dwDIBSize ); memcpy( frame_bits, icon_data + entry->dwDIBOffset, entry->dwDIBSize ); @@ -1086,7 +1086,7 @@ HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize, static HICON CURSORICON_LoadFromFile( LPCWSTR filename, - INT width, INT height, INT colors, + INT width, INT height, INT depth, BOOL fCursor, UINT loadflags) { CURSORICONFILEDIRENTRY *entry; @@ -1106,7 +1106,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, if (memcmp( bits, "RIFF", 4 ) == 0) { hIcon = CURSORICON_CreateIconFromANI( bits, filesize, width, height, - colors ); + depth ); goto end; } @@ -1118,9 +1118,9 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, goto end; if ( fCursor ) - entry = CURSORICON_FindBestCursorFile( dir, width, height, colors ); + entry = CURSORICON_FindBestCursorFile( dir, width, height, depth ); else - entry = CURSORICON_FindBestIconFile( dir, width, height, colors ); + entry = CURSORICON_FindBestIconFile( dir, width, height, depth ); if ( !entry ) goto end; @@ -1157,7 +1157,7 @@ end: * Load a cursor or icon from resource or file. */ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, - INT width, INT height, INT colors, + INT width, INT height, INT depth, BOOL fCursor, UINT loadflags) { HANDLE handle = 0; @@ -1169,11 +1169,11 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, WORD wResId; DWORD dwBytesInRes; - TRACE("%p, %s, %dx%d, colors %d, fCursor %d, flags 0x%04x\n", - hInstance, debugstr_w(name), width, height, colors, fCursor, loadflags); + TRACE("%p, %s, %dx%d, depth %d, fCursor %d, flags 0x%04x\n", + hInstance, debugstr_w(name), width, height, depth, fCursor, loadflags); if ( loadflags & LR_LOADFROMFILE ) /* Load from file */ - return CURSORICON_LoadFromFile( name, width, height, colors, fCursor, loadflags ); + return CURSORICON_LoadFromFile( name, width, height, depth, fCursor, loadflags ); if (!hInstance) hInstance = user32_module; /* Load OEM cursor/icon */ @@ -1192,9 +1192,9 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; if (!(dir = LockResource( handle ))) return 0; if (fCursor) - dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, colors ); + dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); else - dirEntry = CURSORICON_FindBestIconRes( dir, width, height, colors ); + dirEntry = CURSORICON_FindBestIconRes( dir, width, height, depth ); if (!dirEntry) return 0; wResId = dirEntry->wResId; dwBytesInRes = dirEntry->dwBytesInRes; @@ -1767,21 +1767,16 @@ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon, if( dir && !dir->idReserved && (dir->idType & 3) ) { CURSORICONDIRENTRY* entry; - HDC hdc; - UINT palEnts; - int colors; - hdc = GetDC(0); - palEnts = GetSystemPaletteEntries(hdc, 0, 0, NULL); - if (palEnts == 0) - palEnts = 256; - colors = (cFlag & LR_MONOCHROME) ? 2 : palEnts; + const HDC hdc = GetDC(0); + const int depth = (cFlag & LR_MONOCHROME) ? + 1 : GetDeviceCaps(hdc, BITSPIXEL); ReleaseDC(0, hdc); if( bIcon ) - entry = CURSORICON_FindBestIconRes( dir, width, height, colors ); + entry = CURSORICON_FindBestIconRes( dir, width, height, depth ); else - entry = CURSORICON_FindBestCursorRes( dir, width, height, colors ); + entry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); if( entry ) retVal = entry->wResId; } @@ -2532,10 +2527,9 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (screen_dc) { - UINT palEnts = GetSystemPaletteEntries(screen_dc, 0, 0, NULL); - if (palEnts == 0) palEnts = 256; return CURSORICON_Load(hinst, name, desiredx, desiredy, - palEnts, FALSE, loadflags); + GetDeviceCaps(screen_dc, BITSPIXEL), + FALSE, loadflags); } break;

1 0

Christian Costa : d3dxof: Get rid of cur_subobject.
by Alexandre Julliard Dec. 31, 2009

Dec. 31, 2009

Module: wine Branch: master Commit: 24d6c0a90db075acbcf7f3cf97ece56d1068d814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d6c0a90db075acbcf7f3cf9… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 30 22:06:11 2009 +0100 d3dxof: Get rid of cur_subobject. --- dlls/d3dxof/d3dxof.c | 8 +++----- dlls/d3dxof/d3dxof_private.h | 1 - dlls/d3dxof/parsing.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index cd4690d..67e4f61 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -280,7 +280,6 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV object->buf.pdxf = This; object->buf.txt = (header[2] == XOFFILE_FORMAT_TEXT); object->buf.token_present = FALSE; - object->buf.cur_subobject = 0; TRACE("File size is %d bytes\n", file_size); @@ -1044,7 +1043,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE This->buf.pxo_globals = This->xobjects; This->buf.nb_pxo_globals = This->nb_xobjects; - This->buf.cur_subobject = 1; This->buf.level = 0; This->buf.pxo_tab = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS); @@ -1059,6 +1057,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE This->buf.pxo->pdata = This->buf.pdata = NULL; This->buf.capacity = 0; This->buf.cur_pos_data = 0; + This->buf.pxo->nb_subobjects = 1; pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); if (!pstrings) @@ -1076,10 +1075,9 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE goto error; } - This->buf.pxo->nb_subobjects = This->buf.cur_subobject; - if (This->buf.cur_subobject > MAX_SUBOBJECTS) + if (This->buf.pxo->nb_subobjects > MAX_SUBOBJECTS) { - FIXME("Too many suobjects %d\n", This->buf.cur_subobject); + FIXME("Too many subobjects %d\n", This->buf.pxo->nb_subobjects); hr = DXFILEERR_BADALLOC; goto error; } diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 13c5f54..ffa27d2 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -128,7 +128,6 @@ typedef struct { WORD current_token; BOOL token_present; BOOL txt; - ULONG cur_subobject; ULONG cur_pos_data; LPBYTE cur_pstrings; BYTE value[100]; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index fb5ab4e..ec962b0 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1212,14 +1212,14 @@ _exit: ERR("Reference to unknown object %s\n", (char*)buf->value); return FALSE; } - buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; + buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j]; buf->pxo->nb_childs++; } else if (check_TOKEN(buf) == TOKEN_NAME) { xobject* pxo = buf->pxo; - buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; + buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; TRACE("Enter optional %s\n", (char*)buf->value); buf->level++;

1 0