September 2008 - Wine-Commits

Henri Verbeet : wined3d: Remove the "Wine 1.0 safety path".
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: 254349fb4d3cc9a501793feae7cf4fa785d87b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=254349fb4d3cc9a501793feae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 24 08:58:12 2008 +0200 wined3d: Remove the "Wine 1.0 safety path". --- dlls/wined3d/surface.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bba2050..4c6acc3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -632,16 +632,6 @@ void WINAPI IWineD3DSurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT te TRACE("(%p) : setting textureName %u, target %#x\n", This, textureName, target); if (This->glDescription.textureName == 0 && textureName != 0) { IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); - if((This->Flags & SFLAG_LOCATIONS) == 0) { - /* In 1.0-rc4 and earlier, AddDirtyRect was called in the place of this if condition. - * This had the problem that a correctly set INDRAWABLE flag was removed if the PreLoad - * during the offscreen rendering readback triggered the creation of the GL texture. - * The change intended to keep the INDRAWABLE intact. To prevent unintended side effects - * before release, set the INSYSMEM flag like the old AddDirtyRect did. - */ - WARN("Wine 1.0 safety path hit\n"); - This->Flags |= SFLAG_INSYSMEM; - } } if(target == GL_TEXTURE_RECTANGLE_ARB && This->glDescription.target != target) { This->Flags &= ~SFLAG_NORMCOORD;

1 0

Henri Verbeet : wined3d: Make some more GLSL functions private to the backend.
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: 5ba40c3d5876767911b8e70da5a141ea9329889d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba40c3d5876767911b8e70da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 23 17:39:34 2008 +0200 wined3d: Make some more GLSL functions private to the backend. --- dlls/wined3d/baseshader.c | 2 + dlls/wined3d/glsl_shader.c | 102 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 58 ----------------------- 3 files changed, 53 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ba40c3d5876767911b8e…

1 0

Henri Verbeet : wined3d: Make some more ARB program functions private to the backend.
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: a0940051eb6a042c313ef7b16a886175454c051b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0940051eb6a042c313ef7b16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 23 17:39:34 2008 +0200 wined3d: Make some more ARB program functions private to the backend. --- dlls/wined3d/arb_program_shader.c | 54 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 36 ------------------------ 2 files changed, 27 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0940051eb6a042c313ef…

1 0

Henri Verbeet : wined3d: atifs_shader_backend doesn't exist anymore.
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: daef052daa7ebfcf077b743d6f5b60e9d8441097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daef052daa7ebfcf077b743d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 23 17:39:34 2008 +0200 wined3d: atifs_shader_backend doesn't exist anymore. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 908e055..2b49beb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -341,7 +341,6 @@ typedef struct { BOOL (*shader_conv_supported)(WINED3DFORMAT conv); } shader_backend_t; -extern const shader_backend_t atifs_shader_backend; extern const shader_backend_t glsl_shader_backend; extern const shader_backend_t arb_program_shader_backend; extern const shader_backend_t none_shader_backend;

1 0

Henri Verbeet : wined3d: Move part of the shader instruction table to the backend.
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: 2e76954097fb090d3276586efea6b2dfb8865f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e76954097fb090d3276586ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 23 17:39:34 2008 +0200 wined3d: Move part of the shader instruction table to the backend. --- dlls/wined3d/arb_program_shader.c | 88 +++++++++++++++++++ dlls/wined3d/baseshader.c | 9 +- dlls/wined3d/glsl_shader.c | 88 +++++++++++++++++++ dlls/wined3d/pixelshader.c | 170 ++++++++++++++++++------------------ dlls/wined3d/vertexshader.c | 114 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 95 ++++++++++++++++++++- 6 files changed, 415 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e76954097fb090d32765…

1 0

Jacek Caban : jscript: Fixed a typo.
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: 87e2c255491a0b52ed2b13970448e5136f8f4c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e2c255491a0b52ed2b13970… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 01:48:57 2008 +0200 jscript: Fixed a typo. Spotted by Michael Stefaniuc. --- dlls/jscript/engine.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bc0b525..8f3ab02 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -951,7 +951,8 @@ HRESULT with_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t * hres = scope_push(ctx->scope_chain, obj, &ctx->scope_chain); jsdisp_release(obj); - if(FAILED(hres)); + if(FAILED(hres)) + return hres; hres = stat_eval(ctx, stat->statement, rt, ret);

1 0

Jacek Caban : jscript: Added RegExp contruction implementation.
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: 98f2dfee9cabde7fd62d11cd2850d608ec055aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f2dfee9cabde7fd62d11cd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 24 01:48:37 2008 +0200 jscript: Added RegExp contruction implementation. --- dlls/jscript/global.c | 2 +- dlls/jscript/regexp.c | 74 ++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/regexp.js | 24 +++++++++++++ 3 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index adee371..30e2bd5 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -426,7 +426,7 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = create_object_constr(ctx, &ctx->regexp_constr); + hres = create_regexp_constr(ctx, &ctx->regexp_constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 863b52e..e811e48 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3546,11 +3546,81 @@ static HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD return S_OK; } +static HRESULT regexp_constructor(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *retv) +{ + const WCHAR *opt = emptyW, *src; + DispatchEx *ret; + VARIANT *arg; + HRESULT hres; + + if(!arg_cnt(dp)) { + FIXME("no args\n"); + return E_NOTIMPL; + } + + arg = get_arg(dp,0); + if(V_VT(arg) == VT_DISPATCH) { + DispatchEx *obj; + + obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); + if(obj) { + if(is_class(obj, JSCLASS_REGEXP)) { + RegExpInstance *regexp = (RegExpInstance*)obj; + + hres = create_regexp(ctx, regexp->str, -1, regexp->jsregexp->flags, &ret); + jsdisp_release(obj); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret); + return S_OK; + } + + jsdisp_release(obj); + } + } + + if(V_VT(arg) != VT_BSTR) { + FIXME("vt arg0 = %d\n", V_VT(arg)); + return E_NOTIMPL; + } + + src = V_BSTR(arg); + + if(arg_cnt(dp) >= 2) { + arg = get_arg(dp,1); + if(V_VT(arg) != VT_BSTR) { + FIXME("unimplemented for vt %d\n", V_VT(arg)); + return E_NOTIMPL; + } + + opt = V_BSTR(arg); + } + + hres = create_regexp_str(ctx, src, -1, opt, strlenW(opt), &ret); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret); + return S_OK; +} + static HRESULT RegExpConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: + return regexp_constructor(dispex->ctx, dp, retv); + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx **ret) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 209ee22..13ce8a2 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -51,4 +51,28 @@ ok(m.length === 2, "m.length is not 1"); ok(m["0"] === "aaab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); +m = "abcabc".match(new RegExp("ab")); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 1, "m.length is not 1"); +ok(m["0"] === "ab", "m[0] is not \"ab\""); + +/* +m = "abcabc".match(new RegExp("ab","g")); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 2, "m.length is not 1"); +ok(m["0"] === "ab", "m[0] is not \"ab\""); +ok(m["1"] === "ab", "m[1] is not \"ab\""); + +m = "abcabc".match(new RegExp(/ab/g)); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 2, "m.length is not 1"); +ok(m["0"] === "ab", "m[0] is not \"ab\""); +ok(m["1"] === "ab", "m[1] is not \"ab\""); + +m = "abcabc".match(new RegExp("ab","g", "test")); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 2, "m.length is not 1"); +ok(m["0"] === "ab", "m[0] is not \"ab\""); +ok(m["1"] === "ab", "m[1] is not \"ab\""); +*/ reportSuccess();

1 0

Andrew Talbot : crypt32: Sign-compare warnings fix.
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: 7a54be05f0ee971bd2e0d62c1fa8c0f263efa093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a54be05f0ee971bd2e0d62c1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 23 22:38:38 2008 +0100 crypt32: Sign-compare warnings fix. --- dlls/crypt32/str.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 7a739a8..b1ccc91 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -167,7 +167,7 @@ static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz) if (psz) { - chars = min(lstrlenA(prefix), csz); + chars = min(strlen(prefix), csz); memcpy(psz, prefix, chars); *(psz + chars) = '='; chars++; @@ -304,7 +304,7 @@ static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz) { DWORD i; - chars = min(lstrlenA(prefix), csz); + chars = min(strlen(prefix), csz); for (i = 0; i < chars; i++) *(psz + i) = prefix[i]; *(psz + chars) = '='; @@ -328,7 +328,7 @@ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) if (psz) { - chars = min(lstrlenW(prefix), csz); + chars = min(strlenW(prefix), csz); memcpy(psz, prefix, chars * sizeof(WCHAR)); *(psz + chars) = '='; chars++; @@ -478,7 +478,7 @@ BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500, { if (!ret) { - DWORD i; + LONG i; *ppszError = pszX500; for (i = 0; i < errorStr - x500; i++) @@ -665,7 +665,7 @@ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType, { if (value->end > value->start) { - DWORD i; + LONG i; LPWSTR ptr = (LPWSTR)nameValue.Value.pbData; for (i = 0; i < value->end - value->start; i++)

1 0

Michael Stefaniuc : oleaut32/tests: Remove redundant NULL check before SysFreeString (Smatch).
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: 99829f1d639bdf4d732bc8c938064f7ab0b2a45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=99829f1d639bdf4d732bc8c93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 23 23:03:34 2008 +0200 oleaut32/tests: Remove redundant NULL check before SysFreeString (Smatch). --- dlls/oleaut32/tests/varformat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 47fb8e6..00551e7 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -67,7 +67,7 @@ static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) if (hres == S_OK) { \ ok(str && strcmpW(str,szResult1) == 0, \ "VarFormatNumber (vt %d): string different\n", vt); \ - if (str) SysFreeString(str); \ + SysFreeString(str); \ } static void test_VarFormatNumber(void) @@ -137,7 +137,7 @@ static const char *szVarFmtFail = "VT %d|0x%04x Format %s: expected 0x%08x, '%s' ok(hres == ret && (FAILED(ret) || !strcmp(buff, str)), \ szVarFmtFail, \ (vt)&VT_TYPEMASK,(vt)&~VT_TYPEMASK,fmt?fmt:"<null>",ret,str,hres,buff); \ - if (out) SysFreeString(out); \ + SysFreeString(out); \ } while(0) typedef struct tagFMTRES

1 0

Vincent Povirk : user32: Handle undocumented WM_POPUPSYSTEMMENU message.
by Alexandre Julliard Sept. 24, 2008

Sept. 24, 2008

Module: wine Branch: master Commit: a2742978d088c2813f2d594c9b01435cf43fca96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2742978d088c2813f2d594c9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 28 14:32:41 2008 -0500 user32: Handle undocumented WM_POPUPSYSTEMMENU message. --- dlls/user32/defwnd.c | 12 ++++++++++++ dlls/user32/spy.c | 3 ++- dlls/user32/user_private.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index ba07ebb..c31956c 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -385,6 +385,18 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } break; + case WM_POPUPSYSTEMMENU: + { + /* This is an undocumented message used by the windows taskbar to + display the system menu of windows that belong to other processes. */ + HMENU menu = GetSystemMenu(hwnd, FALSE); + + if (menu) + TrackPopupMenu(menu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON, + LOWORD(lParam), HIWORD(lParam), 0, hwnd, NULL); + return 0; + } + case WM_NCACTIVATE: return NC_HandleNCActivate( hwnd, wParam, lParam ); diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 41caf1d..9fbd74b 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -592,7 +592,8 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "WM_PALETTEISCHANGING", "WM_PALETTECHANGED", "WM_HOTKEY", /* 0x0312 */ - NULL, NULL, NULL, NULL, + "WM_POPUPSYSTEMMENU", /* 0x0313 */ + NULL, NULL, NULL, "WM_PRINT", /* 0x0317 */ "WM_PRINTCLIENT", /* 0x0318 */ "WM_APPCOMMAND", /* 0x0319 */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index da635b0..40e57e1 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -82,6 +82,7 @@ static inline HLOCAL16 LOCAL_Free( HANDLE16 ds, HLOCAL16 handle ) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) #define WM_SYSTIMER 0x0118 +#define WM_POPUPSYSTEMMENU 0x0313 /* internal messages codes */ enum wine_internal_message

1 0