October 2011 - Wine-commits

Alistair Leslie-Hughes : mmcndmgr: Add MMC interfaces.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: b1b63af04a01e09d5a7419af49f86e1be2b6a222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b63af04a01e09d5a7419af4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 6 21:31:31 2011 +1100 mmcndmgr: Add MMC interfaces. --- .gitignore | 1 + include/Makefile.in | 1 + include/mmc.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 7855a32..0bde06d 100644 --- a/.gitignore +++ b/.gitignore @@ -179,6 +179,7 @@ include/metahost.h include/mimeinfo.h include/mimeole.h include/mlang.h +include/mmc.h include/mmdeviceapi.h include/mmstream.h include/mscoree.h diff --git a/include/Makefile.in b/include/Makefile.in index c5bea43..8533775 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -51,6 +51,7 @@ PUBLIC_IDL_H_SRCS = \ mimeinfo.idl \ mimeole.idl \ mlang.idl \ + mmc.idl \ mmdeviceapi.idl \ mmstream.idl \ mscoree.idl \ diff --git a/include/mmc.idl b/include/mmc.idl new file mode 100644 index 0000000..828660f --- /dev/null +++ b/include/mmc.idl @@ -0,0 +1,49 @@ +/* + * + * Copyright 2011 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "basetsd.h"; +import "oaidl.idl"; + +[ + uuid(A8D2C5FE-CDCB-4B9D-BDE5-A27343FF54BC), +] +interface IMMCVersionInfo : IUnknown +{ + HRESULT GetMMCVersion([out] long * pVersionMajor, [out] long * pVersionMinor); +} + + +[ + uuid(9EECDD85-B715-4188-8A72-61159ABDB8C4), + version(1.0), +] +library MMCVersionLib +{ + importlib("stdole2.tlb"); + + [ + helpstring("MMCVersionInfo coclass"), + uuid(D6FEDB1D-CF21-4BD9-AF3B-C5468E9C6684) + ] + coclass MMCVersionInfo + { + [default] interface IMMCVersionInfo; + } + +}

1 0

Alistair Leslie-Hughes : mmcndmgr: Add mmcndmgr dll.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: dbefe8cbb0f46343160a82354476f1576c362ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbefe8cbb0f46343160a82354… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 6 21:45:02 2011 +1100 mmcndmgr: Add mmcndmgr dll. --- configure | 1 + configure.ac | 1 + dlls/mmcndmgr/Makefile.in | 9 +++++ dlls/mmcndmgr/mmcndmgr.c | 78 +++++++++++++++++++++++++++++++++++++++++++ dlls/mmcndmgr/mmcndmgr.idl | 20 +++++++++++ dlls/mmcndmgr/mmcndmgr.spec | 7 ++++ 6 files changed, 116 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3cf9675..7325264 100755 --- a/configure +++ b/configure @@ -14878,6 +14878,7 @@ wine_fn_config_dll mciwave enable_mciwave wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang implib wine_fn_config_test dlls/mlang/tests mlang_test +wine_fn_config_dll mmcndmgr enable_mmcndmgr wine_fn_config_dll mmdevapi enable_mmdevapi wine_fn_config_test dlls/mmdevapi/tests mmdevapi_test wine_fn_config_dll mmdevldr.vxd enable_win16 diff --git a/configure.ac b/configure.ac index 5de420b..5a9fd2b 100644 --- a/configure.ac +++ b/configure.ac @@ -2581,6 +2581,7 @@ WINE_CONFIG_DLL(mciwave) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[implib]) WINE_CONFIG_TEST(dlls/mlang/tests) +WINE_CONFIG_DLL(mmcndmgr) WINE_CONFIG_DLL(mmdevapi) WINE_CONFIG_TEST(dlls/mmdevapi/tests) WINE_CONFIG_DLL(mmdevldr.vxd,enable_win16) diff --git a/dlls/mmcndmgr/Makefile.in b/dlls/mmcndmgr/Makefile.in new file mode 100644 index 0000000..91038a2 --- /dev/null +++ b/dlls/mmcndmgr/Makefile.in @@ -0,0 +1,9 @@ +MODULE = mmcndmgr.dll +IMPORTS = uuid oleaut32 ole32 user32 + +C_SRCS = \ + mmcndmgr.c + +IDL_TLB_SRCS = mmcndmgr.idl + +(a)MAKE_DLL_RULES@ diff --git a/dlls/mmcndmgr/mmcndmgr.c b/dlls/mmcndmgr/mmcndmgr.c new file mode 100644 index 0000000..2a7e0d4 --- /dev/null +++ b/dlls/mmcndmgr/mmcndmgr.c @@ -0,0 +1,78 @@ +/* + * + * Copyright 2011 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/unicode.h" +#include "wine/debug.h" +#include "wine/library.h" + +#include "mmc.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mmc); + +static HINSTANCE MMC_hInstance; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +{ + FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + if(!ppv) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( MMC_hInstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( MMC_hInstance ); +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + MMC_hInstance = hinstDLL; + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/mmcndmgr/mmcndmgr.idl b/dlls/mmcndmgr/mmcndmgr.idl new file mode 100644 index 0000000..bba1d72 --- /dev/null +++ b/dlls/mmcndmgr/mmcndmgr.idl @@ -0,0 +1,20 @@ +/* + * + * Copyright 2011 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "mmc.idl" diff --git a/dlls/mmcndmgr/mmcndmgr.spec b/dlls/mmcndmgr/mmcndmgr.spec new file mode 100644 index 0000000..dfff992 --- /dev/null +++ b/dlls/mmcndmgr/mmcndmgr.spec @@ -0,0 +1,7 @@ +@ stub CreateExecutivePlatform +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub -arch=win32 _GetAllocCounters(a)0 +@ stub -arch=win64 GetAllocCounters

1 0

Juan Lang : shell32: Check size of input parameters before copying to fixed length buffers.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 726acf0f4a0c71a0a12ad089b41d9ea1bd3e1d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=726acf0f4a0c71a0a12ad089b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Oct 16 13:07:05 2011 -0700 shell32: Check size of input parameters before copying to fixed length buffers. --- dlls/shell32/shlexec.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 3f7a170..b25a04b 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -788,14 +788,25 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec WCHAR * exec; DWORD ddeInst = 0; DWORD tid; - DWORD resultLen; + DWORD resultLen, endkeyLen; HSZ hszApp, hszTopic; HCONV hConv; HDDEDATA hDdeData; unsigned ret = SE_ERR_NOASSOC; BOOL unicode = !(GetVersion() & 0x80000000); + if (strlenW(key) + 1 > sizeof(regkey) / sizeof(regkey[0])) + { + FIXME("input parameter %s larger than buffer\n", debugstr_w(key)); + return 2; + } strcpyW(regkey, key); + endkeyLen = sizeof(regkey) / sizeof(regkey[0]) - (endkey - regkey); + if (strlenW(wApplication) + 1 > endkeyLen) + { + FIXME("endkey %s overruns buffer\n", debugstr_w(wApplication)); + return 2; + } strcpyW(endkey, wApplication); applen = sizeof(app); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, app, &applen) != ERROR_SUCCESS) @@ -809,6 +820,12 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec /* Get application command from start string and find filename of application */ if (*start == '"') { + if (strlenW(start + 1) + 1 > sizeof(command) / sizeof(command[0])) + { + FIXME("size of input parameter %s larger than buffer\n", + debugstr_w(start + 1)); + return 2; + } strcpyW(command, start+1); if ((ptr = strchrW(command, '"'))) *ptr = 0; @@ -835,6 +852,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec ERR("Unable to find application path for command %s\n", debugstr_w(start)); return ERROR_ACCESS_DENIED; } + if (strlenW(ptr) + 1 > sizeof(app) / sizeof(app[0])) + { + FIXME("size of found path %s larger than buffer\n", debugstr_w(ptr)); + return 2; + } strcpyW(app, ptr); /* Remove extensions (including .so) */ @@ -848,6 +870,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec *ptr = 0; } + if (strlenW(wTopic) + 1 > endkeyLen) + { + FIXME("endkey %s overruns buffer\n", debugstr_w(wTopic)); + return 2; + } strcpyW(endkey, wTopic); topiclen = sizeof(topic); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, topic, &topiclen) != ERROR_SUCCESS) @@ -890,6 +917,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec SetLastError(ERROR_DDE_FAIL); return 30; /* whatever */ } + if (strlenW(wIfexec) + 1 > endkeyLen) + { + FIXME("endkey %s overruns buffer\n", debugstr_w(wIfexec)); + return 2; + } strcpyW(endkey, wIfexec); ifexeclen = sizeof(ifexec); if (RegQueryValueW(HKEY_CLASSES_ROOT, regkey, ifexec, &ifexeclen) == ERROR_SUCCESS)

1 0

Juan Lang : shell32: Use existing buffer rather than copying, and potentially truncating, a filename prior to executing it.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 0aad594d5f0d032f88ca174aa2ae56f8493b40df URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aad594d5f0d032f88ca174aa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Oct 16 14:49:14 2011 -0700 shell32: Use existing buffer rather than copying, and potentially truncating, a filename prior to executing it. --- dlls/shell32/shlexec.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index b25a04b..7fd485e 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1797,6 +1797,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* terminate previous command string after the quote character */ *end = '\0'; + lpFile = wfileName; } else { @@ -1827,12 +1828,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } } - lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); + lpFile = sei_tmp.lpFile; } } else - lstrcpynW(wfileName, sei_tmp.lpFile,sizeof(wfileName)/sizeof(WCHAR)); - - lpFile = wfileName; + lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; len = lstrlenW(wszApplicationName) + 1;

1 0

Dmitry Timoshkov : ntdll: FreeBSD needs page read access when execute access is requested.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: f7e466455d07a5efcb697e06c695006c6a06e0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e466455d07a5efcb697e06c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 14 12:16:00 2011 +0900 ntdll: FreeBSD needs page read access when execute access is requested. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5e69eb9..9ba98b4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -189,7 +189,7 @@ static int VIRTUAL_GetUnixProt( BYTE vprot ) if (vprot & VPROT_READ) prot |= PROT_READ; if (vprot & VPROT_WRITE) prot |= PROT_WRITE; if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE; - if (vprot & VPROT_EXEC) prot |= PROT_EXEC; + if (vprot & VPROT_EXEC) prot |= PROT_EXEC | PROT_READ; if (vprot & VPROT_WRITEWATCH) prot &= ~PROT_WRITE; } if (!prot) prot = PROT_NONE;

1 0

Dmitry Timoshkov : ntdll: Move adding VPROT_READ for Solaris to the same place where it' s done for FreeBSD.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 16eac43c8e043fc1d3b92d3fe6074b3d03acb3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16eac43c8e043fc1d3b92d3fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 14 13:47:37 2011 +0900 ntdll: Move adding VPROT_READ for Solaris to the same place where it's done for FreeBSD. --- dlls/ntdll/virtual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9ba98b4..054b924 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -187,8 +187,8 @@ static int VIRTUAL_GetUnixProt( BYTE vprot ) if ((vprot & VPROT_COMMITTED) && !(vprot & VPROT_GUARD)) { if (vprot & VPROT_READ) prot |= PROT_READ; - if (vprot & VPROT_WRITE) prot |= PROT_WRITE; - if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE; + if (vprot & VPROT_WRITE) prot |= PROT_WRITE | PROT_READ; + if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE | PROT_READ; if (vprot & VPROT_EXEC) prot |= PROT_EXEC | PROT_READ; if (vprot & VPROT_WRITEWATCH) prot &= ~PROT_WRITE; } @@ -1345,9 +1345,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) { if (sec->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) - vprot |= VPROT_READ | VPROT_WRITE; + vprot |= VPROT_WRITE; else - vprot |= VPROT_READ | VPROT_WRITECOPY; + vprot |= VPROT_WRITECOPY; } /* Dumb game crack lets the AOEP point into a data section. Adjust. */

1 0

Jacek Caban : vbscript: Added lexer support for '_'.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 64fd6fa7872059379e0eb42392a9fe5f65487e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fd6fa7872059379e0eb4239… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 14:32:13 2011 +0200 vbscript: Added lexer support for '_'. --- dlls/vbscript/lex.c | 10 ++++++++++ dlls/vbscript/tests/lang.vbs | 7 +++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index ac3d65e..08ab375 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -354,6 +354,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '^': case '\\': case '.': + case '_': return *ctx->ptr++; case '(': /* NOTE: @@ -402,6 +403,15 @@ int parser_lex(void *lval, parser_ctx_t *ctx) while(1) { ret = parse_next_token(lval, ctx); + if(ret == '_') { + skip_spaces(ctx); + if(*ctx->ptr != '\n') { + FIXME("'_' not followed by newline\n"); + return 0; + } + ctx->ptr++; + continue; + } if(ret != tNL || ctx->last_token != tNL) break; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 46a0330..de72338 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -177,6 +177,13 @@ Call ok(2^3^2 = 64, "2^3^2 = " & (2^3^2)) Call ok(-3^2 = 9, "-3^2 = " & (-3^2)) Call ok(2*3^2 = 18, "2*3^2 = " & (2*3^2)) +x =_ + 3 +x _ + = 3 + +x = 3 + if true then y = true : x = y ok x, "x is false" diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 367ffea..9fa4240 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1226,6 +1226,8 @@ static void run_tests(void) parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); + parse_script_a("x = _ \n3"); + test_global_vars_ref(TRUE); test_global_vars_ref(FALSE);

1 0

Aric Stewart : usp10: Handle the fNeedsCaretInfo flag in XtoCP and CPtoX.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 8f4fab2483a7ff8bb680bdaa60bd5f50c57e525c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4fab2483a7ff8bb680bdaa6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 17 07:41:16 2011 -0500 usp10: Handle the fNeedsCaretInfo flag in XtoCP and CPtoX. --- dlls/usp10/usp10.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 65d42e4..3f323b2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1697,12 +1697,30 @@ HRESULT WINAPI ScriptCPtoX(int iCP, iPosX += special_size; } else - iPosX += piAdvance[clust] / (float)clust_size; + { + if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) + { + clust_size --; + if (clust_size == 0) + iPosX += piAdvance[clust]; + } + else + iPosX += piAdvance[clust] / (float)clust_size; + } } else if (iSpecial != -1) iPosX += special_size; else /* (iCluster != -1) */ - iPosX += piAdvance[pwLogClust[iCluster]] / (float)clust_size; + { + if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) + { + clust_size --; + if (clust_size == 0) + iPosX += piAdvance[pwLogClust[iCluster]]; + } + else + iPosX += piAdvance[pwLogClust[iCluster]] / (float)clust_size; + } } if (iMaxPos > 0) @@ -1737,6 +1755,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, int iSpecial = -1; int iCluster = -1; int clust_size = 1; + int cjump = 0; float special_size = 0.0; int direction = 1; @@ -1795,6 +1814,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, clust_size = 1; iCluster = -1; + cjump = 0; for (check = item+direction; check < cChars && check >= 0; check+=direction) { @@ -1816,12 +1836,30 @@ HRESULT WINAPI ScriptXtoCP(int iX, iPosX += special_size; } else - iPosX += piAdvance[clust] / (float)clust_size; + { + if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) + { + if (!cjump) + iPosX += piAdvance[clust]; + cjump++; + } + else + iPosX += piAdvance[clust] / (float)clust_size; + } } else if (iSpecial != -1) iPosX += special_size; else /* (iCluster != -1) */ - iPosX += piAdvance[pwLogClust[iCluster]] / (float)clust_size; + { + if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) + { + if (!cjump) + iPosX += piAdvance[pwLogClust[iCluster]]; + cjump++; + } + else + iPosX += piAdvance[pwLogClust[iCluster]] / (float)clust_size; + } } if (direction > 0) @@ -1829,7 +1867,11 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (iPosX > iX) item--; if (item < cChars && ((iPosX - iLastPosX) / 2.0) + iX >= iPosX) + { + if (scriptInformation[psa->eScript].props.fNeedsCaretInfo && clust_size > 1) + item+=(clust_size-1); *piTrailing = 1; + } else *piTrailing = 0; } @@ -1843,7 +1885,11 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (iLastPosX == iX) *piTrailing = 0; else if (item < 0 || ((iLastPosX - iPosX) / 2.0) + iX <= iLastPosX) + { + if (scriptInformation[psa->eScript].props.fNeedsCaretInfo && clust_size > 1) + item-=(clust_size-1); *piTrailing = 1; + } else *piTrailing = 0; }

1 0

Huw Davies : gdi32: Allow a caller to build_rle_bitmap to not request the clip region.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 2127e9444dd2bc07531d78cbe4b1d9f35d36fc95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2127e9444dd2bc07531d78cbe… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 17 15:46:04 2011 +0100 gdi32: Allow a caller to build_rle_bitmap to not request the clip region. --- dlls/gdi32/dib.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 20041ad..eea257c 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -252,14 +252,19 @@ static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bit BYTE skip, num, data; BYTE *out_bits, *in_bits = bits->ptr; - *clip = NULL; + if (clip) *clip = NULL; assert( info->bmiHeader.biBitCount == 4 || info->bmiHeader.biBitCount == 8 ); - out_bits = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info ) ); - *clip = CreateRectRgn( 0, 0, 0, 0 ); - run = CreateRectRgn( 0, 0, 0, 0 ); - if (!out_bits || !*clip || !run) goto fail; + out_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, get_dib_image_size( info ) ); + if (!out_bits) goto fail; + + if (clip) + { + *clip = CreateRectRgn( 0, 0, 0, 0 ); + run = CreateRectRgn( 0, 0, 0, 0 ); + if (!*clip || !run) goto fail; + } x = left = right = 0; y = height - 1; @@ -299,7 +304,7 @@ static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bit { if (data < 3) { - if(left != right) + if(left != right && clip) { SetRectRgn( run, left, y, right, y + 1 ); CombineRgn( *clip, run, *clip, RGN_OR ); @@ -365,7 +370,7 @@ static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bit } done: - DeleteObject( run ); + if (run) DeleteObject( run ); if (bits->free) bits->free( bits ); bits->ptr = out_bits; @@ -376,7 +381,7 @@ done: fail: if (run) DeleteObject( run ); - if (*clip) DeleteObject( *clip ); + if (clip && *clip) DeleteObject( *clip ); HeapFree( GetProcessHeap(), 0, out_bits ); return FALSE; }

1 0

Huw Davies : gdi32: Move the intersection of vis rects into a separate function.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 64f6e9bc583f9ad54f2912b75847c1eb68f34de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f6e9bc583f9ad54f2912b75… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 17 15:46:05 2011 +0100 gdi32: Move the intersection of vis rects into a separate function. --- dlls/gdi32/bitblt.c | 103 ++++++++++++++++++++++++--------------------- dlls/gdi32/gdi_private.h | 3 + 2 files changed, 58 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 28b1a73..ea5ad41 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -47,6 +47,60 @@ static inline void swap_ints( int *i, int *j ) *j = tmp; } +BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src ) +{ + RECT rect; + + /* intersect the rectangles */ + + if ((src->width == dst->width) && (src->height == dst->height)) /* no stretching */ + { + offset_rect( &src->visrect, dst->x - src->x, dst->y - src->y ); + intersect_rect( &rect, &src->visrect, &dst->visrect ); + src->visrect = dst->visrect = rect; + offset_rect( &src->visrect, src->x - dst->x, src->y - dst->y ); + } + else /* stretching */ + { + /* map source rectangle into destination coordinates */ + rect = src->visrect; + offset_rect( &rect, -min( src->x, src->x + src->width + 1), + -min( src->y, src->y + src->height + 1) ); + rect.left = dst->x + rect.left * dst->width / abs(src->width); + rect.top = dst->y + rect.top * dst->height / abs(src->height); + rect.right = dst->x + rect.right * dst->width / abs(src->width); + rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); + if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); + if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); + + /* avoid rounding errors */ + rect.left--; + rect.top--; + rect.right++; + rect.bottom++; + if (!intersect_rect( &dst->visrect, &rect, &dst->visrect )) return FALSE; + + /* map destination rectangle back to source coordinates */ + rect = dst->visrect; + offset_rect( &rect, -min( dst->x, dst->x + dst->width + 1), + -min( dst->y, dst->y + dst->height + 1) ); + rect.left = src->x + rect.left * src->width / abs(dst->width); + rect.top = src->y + rect.top * src->height / abs(dst->height); + rect.right = src->x + rect.right * src->width / abs(dst->width); + rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); + if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); + if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); + + /* avoid rounding errors */ + rect.left--; + rect.top--; + rect.right++; + rect.bottom++; + if (!intersect_rect( &src->visrect, &rect, &src->visrect )) return FALSE; + } + return TRUE; +} + static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, DC *dc_src, struct bitblt_coords *src ) { @@ -104,54 +158,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, if (is_rect_empty( &src->visrect )) return FALSE; if (is_rect_empty( &dst->visrect )) return FALSE; - /* intersect the rectangles */ - - if ((src->width == dst->width) && (src->height == dst->height)) /* no stretching */ - { - offset_rect( &src->visrect, dst->x - src->x, dst->y - src->y ); - intersect_rect( &rect, &src->visrect, &dst->visrect ); - src->visrect = dst->visrect = rect; - offset_rect( &src->visrect, src->x - dst->x, src->y - dst->y ); - } - else /* stretching */ - { - /* map source rectangle into destination coordinates */ - rect = src->visrect; - offset_rect( &rect, -min( src->x, src->x + src->width + 1), - -min( src->y, src->y + src->height + 1) ); - rect.left = dst->x + rect.left * dst->width / abs(src->width); - rect.top = dst->y + rect.top * dst->height / abs(src->height); - rect.right = dst->x + rect.right * dst->width / abs(src->width); - rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); - if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); - if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); - - /* avoid rounding errors */ - rect.left--; - rect.top--; - rect.right++; - rect.bottom++; - if (!intersect_rect( &dst->visrect, &rect, &dst->visrect )) return FALSE; - - /* map destination rectangle back to source coordinates */ - rect = dst->visrect; - offset_rect( &rect, -min( dst->x, dst->x + dst->width + 1), - -min( dst->y, dst->y + dst->height + 1) ); - rect.left = src->x + rect.left * src->width / abs(dst->width); - rect.top = src->y + rect.top * src->height / abs(dst->height); - rect.right = src->x + rect.right * src->width / abs(dst->width); - rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); - if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); - if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); - - /* avoid rounding errors */ - rect.left--; - rect.top--; - rect.right++; - rect.bottom++; - if (!intersect_rect( &src->visrect, &rect, &src->visrect )) return FALSE; - } - return TRUE; + return intersect_vis_rectangles( dst, src ); } void free_heap_bits( struct gdi_image_bits *bits ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d8648ef..bf1bc18 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -222,6 +222,9 @@ typedef struct tagBITMAPOBJ extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; +/* bitblt.c */ +extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords *src ) DECLSPEC_HIDDEN; + /* bitmap.c */ extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN;

1 0