wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Piotr Caban : shell32: Remove code for separating arguments from file path.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Module: wine Branch: master Commit: 8e853a3e908fcdcae276defc26a08800d9fec7ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e853a3e908fcdcae276defc2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 17:33:57 2015 +0200 shell32: Remove code for separating arguments from file path. --- dlls/shell32/shlexec.c | 84 ++++---------------------------------------- dlls/shell32/tests/shlexec.c | 20 ++++------- 2 files changed, 12 insertions(+), 92 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 2d9690a..9865005 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1423,11 +1423,10 @@ static UINT_PTR SHELL_execute_class( LPCWSTR wszApplicationName, LPSHELLEXECUTEI return rslt; } -static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters, DWORD parametersLen, LPWSTR wszApplicationName, DWORD dwApplicationNameLen ) +static void SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters, DWORD parametersLen, LPWSTR wszApplicationName, DWORD dwApplicationNameLen ) { static const WCHAR wExplorer[] = {'e','x','p','l','o','r','e','r','.','e','x','e',0}; WCHAR buffer[MAX_PATH]; - BOOL appKnownSingular = FALSE; /* last chance to translate IDList: now also allow CLSID paths */ if (SUCCEEDED(SHELL_GetPathFromIDListForExecuteW(sei->lpIDList, buffer, sizeof(buffer)/sizeof(WCHAR)))) { @@ -1441,7 +1440,6 @@ static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter ERR("application len exceeds buffer size (%i > %i), truncating\n", lstrlenW(wExplorer) + 1, dwApplicationNameLen); lstrcpynW(wszApplicationName, wExplorer, dwApplicationNameLen); - appKnownSingular = TRUE; sei->fMask &= ~SEE_MASK_INVOKEIDLIST; } else { @@ -1461,12 +1459,10 @@ static BOOL SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter buffer, target, sei->lpIDList, NULL, &resultLen); if (resultLen > dwApplicationNameLen) ERR("Argify buffer not large enough... truncating\n"); - appKnownSingular = FALSE; } sei->fMask &= ~SEE_MASK_INVOKEIDLIST; } } - return appKnownSingular; } static UINT_PTR SHELL_quote_and_execute( LPCWSTR wcmd, LPCWSTR wszParameters, LPCWSTR wszKeyname, LPCWSTR wszApplicationName, LPWSTR env, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, SHELL_ExecuteW32 execfunc ) @@ -1574,12 +1570,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) DWORD wcmdLen = sizeof(wcmdBuffer) / sizeof(WCHAR); DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ - WCHAR wfileName[MAX_PATH]; WCHAR *env; WCHAR wszKeyname[256]; LPCWSTR lpFile; UINT_PTR retval = SE_ERR_NOASSOC; - BOOL appKnownSingular = FALSE; /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ sei_tmp = *sei; @@ -1607,7 +1601,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) memcpy(wszApplicationName, sei_tmp.lpFile+1, (l+1)*sizeof(WCHAR)); if (wszApplicationName[l-1] == '\"') wszApplicationName[l-1] = '\0'; - appKnownSingular = TRUE; TRACE("wszApplicationName=%s\n",debugstr_w(wszApplicationName)); } else { DWORD l = strlenW(sei_tmp.lpFile)+1; @@ -1678,7 +1671,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } SHGetPathFromIDListW(sei_tmp.lpIDList, wszApplicationName); - appKnownSingular = TRUE; TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } @@ -1710,10 +1702,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* Has the IDList not yet been translated? */ if (sei_tmp.fMask & SEE_MASK_IDLIST) { - appKnownSingular = SHELL_translate_idlist( &sei_tmp, wszParameters, - parametersLen, - wszApplicationName, - dwApplicationNameLen ); + SHELL_translate_idlist( &sei_tmp, wszParameters, + parametersLen, + wszApplicationName, + dwApplicationNameLen ); } /* convert file URLs */ @@ -1746,7 +1738,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) HeapFree(GetProcessHeap(), 0, wszApplicationName); dwApplicationNameLen = len + 1; wszApplicationName = buf; - /* appKnownSingular unmodified */ sei_tmp.lpFile = wszApplicationName; } @@ -1770,70 +1761,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* Else, try to execute the filename */ TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); - - /* separate out command line arguments from executable file name */ - if (!*sei_tmp.lpParameters && !appKnownSingular) { - /* If the executable path is quoted, handle the rest of the command line as parameters. */ - if (sei_tmp.lpFile[0] == '"') { - LPWSTR src = wszApplicationName/*sei_tmp.lpFile*/ + 1; - LPWSTR dst = wfileName; - LPWSTR end; - - /* copy the unquoted executable path to 'wfileName' */ - while(*src && *src!='"') - *dst++ = *src++; - - *dst = '\0'; - - if (*src == '"') { - end = ++src; - - while(isspace(*src)) - ++src; - } else - end = src; - - /* copy the parameter string to 'wszParameters' */ - strcpyW(wszParameters, src); - - /* terminate previous command string after the quote character */ - *end = '\0'; - lpFile = wfileName; - } - else - { - /* If the executable name is not quoted, we have to use this search loop here, - that in CreateProcess() is not sufficient because it does not handle shell links. */ - WCHAR buffer[MAX_PATH], xlpFile[MAX_PATH]; - LPWSTR space, s; - - LPWSTR beg = wszApplicationName/*sei_tmp.lpFile*/; - for(s=beg; (space=strchrW(s, ' ')); s=space+1) { - int idx = space-sei_tmp.lpFile; - memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR)); - buffer[idx] = '\0'; - - /*FIXME This finds directory paths if the targeted file name contains spaces. */ - if (SearchPathW(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, buffer, wszExe, sizeof(xlpFile)/sizeof(xlpFile[0]), xlpFile, NULL)) - { - /* separate out command from parameter string */ - LPCWSTR p = space + 1; - - while(isspaceW(*p)) - ++p; - - strcpyW(wszParameters, p); - *space = '\0'; - - break; - } - } - - lpFile = sei_tmp.lpFile; - } - } else - lpFile = sei_tmp.lpFile; - + lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; len = lstrlenW(wszApplicationName) + 1; if (sei_tmp.lpParameters[0]) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5189d2e..e3b245a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -902,7 +902,7 @@ static filename_tests_t filename_tests[]= {"QuotedUpperL", "%s\\test file.shlexec", 0x0, 33}, /* Test file masked due to space */ - {NULL, "%s\\masked file.shlexec", 0x1, 33}, + {NULL, "%s\\masked file.shlexec", 0x0, 33}, /* Test if quoting prevents the masking */ {NULL, "%s\\masked file.shlexec", 0x40, 33}, @@ -933,7 +933,7 @@ static void test_lpFile_parsed(void) /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); @@ -1542,18 +1542,10 @@ static void test_filename(void) } if (rc > 32) rc=33; - if ((test->todo & 0x1)==0) - { - ok(rc==test->rc || - broken(quotedfile && rc == SE_ERR_FNF), /* NT4 */ - "%s failed: rc=%ld err=%u\n", shell_call, - rc, GetLastError()); - } - else todo_wine - { - ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, - rc, GetLastError()); - } + ok(rc==test->rc || + broken(quotedfile && rc == SE_ERR_FNF), /* NT4 */ + "%s failed: rc=%ld err=%u\n", shell_call, + rc, GetLastError()); if (rc == 33) { const char* verb;

1 0

Jeremy Newman : add new RSVP form for WineConf 2015
by Jeremy Newman 15 Jul '15

15 Jul '15

Module: website Branch: master Commit: 7af1b4eda7077e93f0346f678773df539da117da URL: http://source.winehq.org/git/website.git/?a=commit;h=7af1b4eda7077e93f0346f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 15 10:20:58 2015 -0500 add new RSVP form for WineConf 2015 also remove old forms --- templates/en/wineconf/rsvp.template | 14 +--- templates/en/wineconf/rsvp_done.template | 5 -- templates/en/wineconf/rsvp_form.template | 30 --------- templates/en/wineconf/survey.template | 14 ---- templates/en/wineconf/survey_done.template | 5 -- templates/en/wineconf/survey_form.template | 103 ----------------------------- templates/tr/wineconf/rsvp.template | 14 ---- templates/tr/wineconf/rsvp_done.template | 5 -- templates/tr/wineconf/rsvp_form.template | 30 --------- templates/tr/wineconf/survey.template | 14 ---- templates/tr/wineconf/survey_done.template | 5 -- 11 files changed, 2 insertions(+), 237 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index f07b9ac..3b4db57 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,14 +1,4 @@ - + -<table width="100%"> -<tr> - <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center><FONT size="+2"><b>October 1 - 2, 2011<br>Minneapolis, MN</b></font></center></td> -</tr> -</table> +<iframe id="rsvp" src="https://docs.google.com/forms/d/15RugGIfd1gU-BguHWyfDvhjF2PSkdDpS1-pOkgDrh5…" frameborder="0" marginheight="0" marginwidth="0" width="90%" height="900">Loading...</iframe> -<hr /> - - - -<p> </p> diff --git a/templates/en/wineconf/rsvp_done.template b/templates/en/wineconf/rsvp_done.template deleted file mode 100644 index efd17e3..0000000 --- a/templates/en/wineconf/rsvp_done.template +++ /dev/null @@ -1,5 +0,0 @@ -<h3>Thanks!</h3> - -<p>Your name and email has been listed for attending WineConf.</p> - -<p> </p> diff --git a/templates/en/wineconf/rsvp_form.template b/templates/en/wineconf/rsvp_form.template deleted file mode 100644 index 88843f4..0000000 --- a/templates/en/wineconf/rsvp_form.template +++ /dev/null @@ -1,30 +0,0 @@ -{$error} - -<p>This form is to let us know you plan on attending WineConf</p> - -<form name="rsvp" action="{$self}" method="post"> - -<table> - -<tr> - <th>Name:</th> - <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> -</tr> - -<tr> - <th>Email:</th> - <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> -</tr> - -<tr> - <th>Comments:</th> - <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> -</tr> - -</table> - -<p><input type="submit" name="submit" value=" Submit RSVP " class="button" /></p> - -<input type="hidden" name="fields" value="name|email|comment" /> - -</form> diff --git a/templates/en/wineconf/survey.template b/templates/en/wineconf/survey.template deleted file mode 100644 index 7ded9ea..0000000 --- a/templates/en/wineconf/survey.template +++ /dev/null @@ -1,14 +0,0 @@ - - -<table width="100%"> -<tr> - <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"></td> -</tr> -</table> - -<hr /> - - - -<p> </p> diff --git a/templates/en/wineconf/survey_done.template b/templates/en/wineconf/survey_done.template deleted file mode 100644 index 52b887d..0000000 --- a/templates/en/wineconf/survey_done.template +++ /dev/null @@ -1,5 +0,0 @@ -<h3>Thanks!</h3> - -<p>This well help us decide on the next WineConf.</p> - -<p> </p> diff --git a/templates/en/wineconf/survey_form.template b/templates/en/wineconf/survey_form.template deleted file mode 100644 index 5463d6a..0000000 --- a/templates/en/wineconf/survey_form.template +++ /dev/null @@ -1,103 +0,0 @@ -{$error} - -<p></p> - -<form name="survey" action="{$self}" method="post"> - -<p> -The current plan is to host Wineconf in Saint Paul, Minnesota, over the -weekend of September 27 and 28, 2008. -</p> -<p> -This year we have some funding in the Wine Party Fund for travel costs. -The hope is that this will mitigate the pain for many Europeans that might not otherwise -come to Minnesota. It's not an infinite supply, so we will -have to prioritize to favor people with proven contribution histories. -</p> -<p> -Please fill out this survey to help me figure out how to manage that -funding and to help me plan the dates. -</p> - -<p>How does the location work for you:</p> - -<ol> - <li> - <input type="radio" name="q[location]" value="good" checked="checked" /> - I am happy to come to the USA, it's the best choice for me. - </li> - - <li> - <input type="radio" name="q[location]" value="okay" /> - St. Paul is okay for this year, but in general, Europe is better. - </li> - - <li> - <input type="radio" name="q[location]" value="hateusa" /> - I will never travel to the USA under any circumstances. - </li> -</ol> - -<p>How does the date work:</p> - -<ol> - <li> - <input type="radio" name="q[date]" value="fine" checked="checked" /> - The weekend of September 27th works fine for me. - </li> - - <li> - <input type="radio" name="q[date]" value="move" /> - I could make it, but I need a different date (please specify below). - </li> - - <li> - <input type="radio" name="q[date]" value="no" /> - This fall is just bad for me; I can't come. - </li> -</ol> - -<p>Do you need travel sponsorship:</p> - -<ol> - - <li> - <input type="radio" name="q[money]" value="need" /> - I can't come without financial aid. - </li> - <li> - <input type="radio" name="q[money]" value="some" /> - I could come, but boy would it be nice to have some help. - </li> - - <li> - <input type="radio" name="q[money]" value="none" /> - I don't need any financial help for the travel. - </li> - -</ol> - -<table> - -<tr> - <th>Name:</th> - <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> -</tr> - -<tr> - <th>Email:</th> - <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> -</tr> - -<tr> - <th>Comments:</th> - <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> -</tr> - -</table> - -<p><input type="submit" name="submit" value=" Submit Survey " class="button" /></p> - -<input type="hidden" name="fields" value="location|date|money|name|email|comment" /> - -</form> diff --git a/templates/tr/wineconf/rsvp.template b/templates/tr/wineconf/rsvp.template deleted file mode 100644 index 647dc0a..0000000 --- a/templates/tr/wineconf/rsvp.template +++ /dev/null @@ -1,14 +0,0 @@ - - -<table width="100%"> -<tr> - <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center><FONT size="+2"><b>1 - 2 Ekim 2011<br>Minneapolis, MN</b></font></center></td> -</tr> -</table> - -<hr /> - - - -<p> </p> diff --git a/templates/tr/wineconf/rsvp_done.template b/templates/tr/wineconf/rsvp_done.template deleted file mode 100644 index 9baac40..0000000 --- a/templates/tr/wineconf/rsvp_done.template +++ /dev/null @@ -1,5 +0,0 @@ -<h3>Teşekkürler!</h3> - -<p>Adınız ve e-postanız WineConf'a katılıyor olarak listelendi.</p> - -<p> </p> diff --git a/templates/tr/wineconf/rsvp_form.template b/templates/tr/wineconf/rsvp_form.template deleted file mode 100644 index dea6d1b..0000000 --- a/templates/tr/wineconf/rsvp_form.template +++ /dev/null @@ -1,30 +0,0 @@ -{$error} - -<p>Bu form, WineConf'a katılmayı planladığınızı bilmemiz içindir</p> - -<form name="rsvp" action="{$self}" method="post"> - -<table> - -<tr> - <th>İsim:</th> - <td><input type="text" name="q[name]" size="40" value="{$name}" /></td> -</tr> - -<tr> - <th>E-posta:</th> - <td><input type="text" name="q[email]" size="40" value="{$email}" /></td> -</tr> - -<tr> - <th>Yorumlar:</th> - <td><textarea name="q[comment]" rows="5" cols="40">{$comment}</textarea></td> -</tr> - -</table> - -<p><input type="submit" name="submit" value=" RSVP Gönder " class="button" /></p> - -<input type="hidden" name="fields" value="name|email|comment" /> - -</form> diff --git a/templates/tr/wineconf/survey.template b/templates/tr/wineconf/survey.template deleted file mode 100644 index 7ded9ea..0000000 --- a/templates/tr/wineconf/survey.template +++ /dev/null @@ -1,14 +0,0 @@ - - -<table width="100%"> -<tr> - <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"></td> -</tr> -</table> - -<hr /> - - - -<p> </p> diff --git a/templates/tr/wineconf/survey_done.template b/templates/tr/wineconf/survey_done.template deleted file mode 100644 index 35fd894..0000000 --- a/templates/tr/wineconf/survey_done.template +++ /dev/null @@ -1,5 +0,0 @@ -<h3>Teşekkürler!</h3> - -<p>Bu sonraki WineConf için karar vermemizde yardımcı olacaktır.</p> - -<p> </p>

1 0

Iván Matellanes : msvcirt: Implement ios stream locking.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 22f28d2923811b85024f63ce43e41966a864ecd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f28d2923811b85024f63ce4… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 13 21:39:09 2015 +0200 msvcirt: Implement ios stream locking. --- dlls/msvcirt/msvcirt.c | 6 ++++-- dlls/msvcirt/tests/msvcirt.c | 27 +++++++++++++++++++++------ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f3c8c3c..9c6b991 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -994,7 +994,8 @@ void __cdecl ios_lock(ios *this) /* ?lockbuf@ios@@QEAAXXZ */ void __cdecl ios_lockbuf(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + streambuf_lock(this->sb); } /* ?lockc@ios@@KAXXZ */ @@ -1130,7 +1131,8 @@ void __cdecl ios_unlock(ios *this) /* ?unlockbuf@ios@@QEAAXXZ */ void __cdecl ios_unlockbuf(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + streambuf_unlock(this->sb); } /* ?unlockc@ios@@KAXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index db0df5e..944c024 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -132,6 +132,8 @@ static void (*__cdecl p_ios_clrlock)(ios*); static void (*__cdecl p_ios_setlock)(ios*); static void (*__cdecl p_ios_lock)(ios*); static void (*__cdecl p_ios_unlock)(ios*); +static void (*__cdecl p_ios_lockbuf)(ios*); +static void (*__cdecl p_ios_unlockbuf)(ios*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -238,6 +240,8 @@ static BOOL init(void) SET(p_ios_setlock, "?setlock@ios@@QEAAXXZ"); SET(p_ios_lock, "?lock@ios@@QEAAXXZ"); SET(p_ios_unlock, "?unlock@ios@@QEAAXXZ"); + SET(p_ios_lockbuf, "?lockbuf@ios@@QEAAXXZ"); + SET(p_ios_unlockbuf, "?unlockbuf@ios@@QEAAXXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); @@ -274,6 +278,8 @@ static BOOL init(void) SET(p_ios_setlock, "?setlock@ios@@QAAXXZ"); SET(p_ios_lock, "?lock@ios@@QAAXXZ"); SET(p_ios_unlock, "?unlock@ios@@QAAXXZ"); + SET(p_ios_lockbuf, "?lockbuf@ios@@QAAXXZ"); + SET(p_ios_unlockbuf, "?unlockbuf@ios@@QAAXXZ"); } init_thiscall_thunk(); @@ -821,15 +827,18 @@ struct ios_lock_arg { ios *ios_obj; HANDLE lock; - HANDLE release; + HANDLE release[2]; }; static DWORD WINAPI lock_ios(void *arg) { struct ios_lock_arg *lock_arg = arg; p_ios_lock(lock_arg->ios_obj); + p_ios_lockbuf(lock_arg->ios_obj); SetEvent(lock_arg->lock); - WaitForSingleObject(lock_arg->release, INFINITE); + WaitForSingleObject(lock_arg->release[0], INFINITE); + p_ios_unlockbuf(lock_arg->ios_obj); + WaitForSingleObject(lock_arg->release[1], INFINITE); p_ios_unlock(lock_arg->ios_obj); return 0; } @@ -949,23 +958,29 @@ static void test_ios(void) lock_arg.ios_obj = &ios_obj; lock_arg.lock = CreateEventW(NULL, FALSE, FALSE, NULL); ok(lock_arg.lock != NULL, "CreateEventW failed\n"); - lock_arg.release = CreateEventW(NULL, FALSE, FALSE, NULL); - ok(lock_arg.release != NULL, "CreateEventW failed\n"); + lock_arg.release[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.release[0] != NULL, "CreateEventW failed\n"); + lock_arg.release[1] = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.release[1] != NULL, "CreateEventW failed\n"); thread = CreateThread(NULL, 0, lock_ios, (void*)&lock_arg, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(lock_arg.lock, INFINITE); locked = TryEnterCriticalSection(&ios_obj.lock); ok(locked == 0, "the ios object was not locked before\n"); + locked = TryEnterCriticalSection(&ios_obj.sb->lock); + ok(locked == 0, "the streambuf was not locked before\n"); - SetEvent(lock_arg.release); + SetEvent(lock_arg.release[0]); + SetEvent(lock_arg.release[1]); WaitForSingleObject(thread, INFINITE); ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); CloseHandle(lock_arg.lock); - CloseHandle(lock_arg.release); + CloseHandle(lock_arg.release[0]); + CloseHandle(lock_arg.release[1]); CloseHandle(thread); }

1 0

Iván Matellanes : msvcirt: Implement ios object locking.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 57fb458774d30935426800457861f70aaa007c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fb458774d30935426800457… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 13 21:39:04 2015 +0200 msvcirt: Implement ios object locking. --- dlls/msvcirt/msvcirt.c | 8 ++++++-- dlls/msvcirt/tests/msvcirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 48fd682..f3c8c3c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -985,7 +985,9 @@ LONG* __thiscall ios_iword(const ios *this, int index) /* ?lock@ios@@QEAAXXZ */ void __cdecl ios_lock(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if (this->do_lock < 0) + EnterCriticalSection(&this->lock); } /* ?lockbuf@ios@@QAAXXZ */ @@ -1119,7 +1121,9 @@ ostream* __thiscall ios_tie_get(const ios *this) /* ?unlock@ios@@QEAAXXZ */ void __cdecl ios_unlock(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if (this->do_lock < 0) + LeaveCriticalSection(&this->lock); } /* ?unlockbuf@ios@@QAAXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 62e1be9..db0df5e 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -130,6 +130,8 @@ static void (*__thiscall p_ios_init)(ios*, streambuf*); static void (*__thiscall p_ios_dtor)(ios*); static void (*__cdecl p_ios_clrlock)(ios*); static void (*__cdecl p_ios_setlock)(ios*); +static void (*__cdecl p_ios_lock)(ios*); +static void (*__cdecl p_ios_unlock)(ios*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -234,6 +236,8 @@ static BOOL init(void) SET(p_ios_dtor, "??1ios@@UEAA@XZ"); SET(p_ios_clrlock, "?clrlock@ios@@QEAAXXZ"); SET(p_ios_setlock, "?setlock@ios@@QEAAXXZ"); + SET(p_ios_lock, "?lock@ios@@QEAAXXZ"); + SET(p_ios_unlock, "?unlock@ios@@QEAAXXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); @@ -268,6 +272,8 @@ static BOOL init(void) SET(p_ios_dtor, "??1ios@@UAE@XZ"); SET(p_ios_clrlock, "?clrlock@ios@@QAAXXZ"); SET(p_ios_setlock, "?setlock@ios@@QAAXXZ"); + SET(p_ios_lock, "?lock@ios@@QAAXXZ"); + SET(p_ios_unlock, "?unlock@ios@@QAAXXZ"); } init_thiscall_thunk(); @@ -811,10 +817,30 @@ static void test_streambuf(void) CloseHandle(thread); } +struct ios_lock_arg +{ + ios *ios_obj; + HANDLE lock; + HANDLE release; +}; + +static DWORD WINAPI lock_ios(void *arg) +{ + struct ios_lock_arg *lock_arg = arg; + p_ios_lock(lock_arg->ios_obj); + SetEvent(lock_arg->lock); + WaitForSingleObject(lock_arg->release, INFINITE); + p_ios_unlock(lock_arg->ios_obj); + return 0; +} + static void test_ios(void) { ios ios_obj, ios_obj2; streambuf *psb; + struct ios_lock_arg lock_arg; + HANDLE thread; + BOOL locked; memset(&ios_obj, 0xab, sizeof(ios)); memset(&ios_obj2, 0xab, sizeof(ios)); @@ -920,9 +946,27 @@ static void test_ios(void) ok(ios_obj.do_lock == -2, "expected -2 got %d\n", ios_obj.do_lock); ok(ios_obj.sb->do_lock == -1, "expected -1 got %d\n", ios_obj.sb->do_lock); + lock_arg.ios_obj = &ios_obj; + lock_arg.lock = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.lock != NULL, "CreateEventW failed\n"); + lock_arg.release = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(lock_arg.release != NULL, "CreateEventW failed\n"); + thread = CreateThread(NULL, 0, lock_ios, (void*)&lock_arg, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(lock_arg.lock, INFINITE); + + locked = TryEnterCriticalSection(&ios_obj.lock); + ok(locked == 0, "the ios object was not locked before\n"); + + SetEvent(lock_arg.release); + WaitForSingleObject(thread, INFINITE); + ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + CloseHandle(lock_arg.lock); + CloseHandle(lock_arg.release); + CloseHandle(thread); } START_TEST(msvcirt)

1 0

Iván Matellanes : msvcirt: Implement ios locking control.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 9d0b679c1bc7187288d86cf996d1708cdc52c94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0b679c1bc7187288d86cf99… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 13 21:39:00 2015 +0200 msvcirt: Implement ios locking control. --- dlls/msvcirt/msvcirt.c | 15 +++++++++++---- dlls/msvcirt/tests/msvcirt.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index c740049..48fd682 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -854,7 +854,11 @@ void __thiscall ios_clear(ios *this, int state) /* ?clrlock@ios@@QEAAXXZ */ void __cdecl ios_clrlock(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if (this->do_lock <= 0) + this->do_lock++; + if (this->sb) + streambuf_clrlock(this->sb); } /* ?delbuf@ios@@QAEXH@Z */ @@ -1002,8 +1006,8 @@ void __cdecl ios_lockc(void) DEFINE_THISCALL_WRAPPER(ios_lockptr, 4) CRITICAL_SECTION* __thiscall ios_lockptr(ios *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return &this->lock; } /* ?oct@@YAAAVios@@AAV1@@Z */ @@ -1081,7 +1085,10 @@ LONG __thiscall ios_setf_mask(ios *this, LONG flags, LONG mask) /* ?setlock@ios@@QEAAXXZ */ void __cdecl ios_setlock(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + this->do_lock--; + if (this->sb) + streambuf_setlock(this->sb); } /* ?sync_with_stdio@ios@@SAXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index bb5a5ed..62e1be9 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -128,6 +128,8 @@ static ios* (*__thiscall p_ios_sb_ctor)(ios*, streambuf*); static ios* (*__thiscall p_ios_assign)(ios*, const ios*); static void (*__thiscall p_ios_init)(ios*, streambuf*); static void (*__thiscall p_ios_dtor)(ios*); +static void (*__cdecl p_ios_clrlock)(ios*); +static void (*__cdecl p_ios_setlock)(ios*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -230,6 +232,8 @@ static BOOL init(void) SET(p_ios_assign, "??4ios@@IEAAAEAV0@AEBV0@@Z"); SET(p_ios_init, "?init@ios@@IEAAXPEAVstreambuf@@@Z"); SET(p_ios_dtor, "??1ios@@UEAA@XZ"); + SET(p_ios_clrlock, "?clrlock@ios@@QEAAXXZ"); + SET(p_ios_setlock, "?setlock@ios@@QEAAXXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); @@ -262,6 +266,8 @@ static BOOL init(void) SET(p_ios_assign, "??4ios@@IAEAAV0@ABV0@@Z"); SET(p_ios_init, "?init@ios@@IAEXPAVstreambuf@@@Z"); SET(p_ios_dtor, "??1ios@@UAE@XZ"); + SET(p_ios_clrlock, "?clrlock@ios@@QAAXXZ"); + SET(p_ios_setlock, "?setlock@ios@@QAAXXZ"); } init_thiscall_thunk(); @@ -861,7 +867,6 @@ static void test_ios(void) call_func2(p_ios_init, &ios_obj, psb); ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); ok(ios_obj.state == 0x8, "expected %x got %x\n", 0x8, ios_obj.state); - ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); /* copy constructor */ @@ -895,7 +900,27 @@ static void test_ios(void) ok(ios_obj.fill == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.fill); ok(ios_obj.width == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.width); ok(ios_obj.do_lock == 2, "expected 2 got %d\n", ios_obj.do_lock); - ios_obj.delbuf = 0; + + /* locking */ + ios_obj.sb = psb; + ios_obj.do_lock = 1; + ios_obj.sb->do_lock = 0; + p_ios_clrlock(&ios_obj); + ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock); + ok(ios_obj.sb->do_lock == 1, "expected 1 got %d\n", ios_obj.sb->do_lock); + ios_obj.do_lock = 0; + p_ios_clrlock(&ios_obj); + ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock); + ok(ios_obj.sb->do_lock == 1, "expected 1 got %d\n", ios_obj.sb->do_lock); + p_ios_setlock(&ios_obj); + ok(ios_obj.do_lock == 0, "expected 0 got %d\n", ios_obj.do_lock); + ok(ios_obj.sb->do_lock == 0, "expected 0 got %d\n", ios_obj.sb->do_lock); + ios_obj.do_lock = -1; + p_ios_setlock(&ios_obj); + ok(ios_obj.do_lock == -2, "expected -2 got %d\n", ios_obj.do_lock); + ok(ios_obj.sb->do_lock == -1, "expected -1 got %d\n", ios_obj.sb->do_lock); + + ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); }

1 0

Hans Leidekker : msi/tests: Avoid another test failure on win2k3.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: dfae842cca0427421684573bb68d8a6005382aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfae842cca0427421684573bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 15 15:15:35 2015 +0200 msi/tests: Avoid another test failure on win2k3. --- dlls/msi/tests/msi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3ae3901..b98a8c2 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -50,6 +50,8 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static INSTALLSTATE (WINAPI *pMsiGetComponentPathA) (LPCSTR, LPCSTR, LPSTR, DWORD*); +static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) + (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); static INSTALLSTATE (WINAPI *pMsiProvideComponentA) (LPCSTR, LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD); static INSTALLSTATE (WINAPI *pMsiProvideComponentW) @@ -92,6 +94,7 @@ static void init_functionpointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(hmsi, MsiGetComponentPathA) + GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hmsi, MsiProvideComponentA) GET_PROC(hmsi, MsiProvideComponentW) GET_PROC(hmsi, MsiGetFileHashA) @@ -14425,7 +14428,8 @@ START_TEST(msi) test_lastusedsource(); test_setpropertyfolder(); test_sourcedir_props(); - test_concurrentinstall(); + if (pMsiGetComponentPathExA) + test_concurrentinstall(); test_command_line_parsing(); SetCurrentDirectoryA(prev_path);

1 0

Hans Leidekker : msi: Add a stub implementation of MsiJoinTransaction.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 0bd46f15010a7b2b580d46c3cc091f34515388e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd46f15010a7b2b580d46c3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 15 15:15:05 2015 +0200 msi: Add a stub implementation of MsiJoinTransaction. --- dlls/msi/msi.c | 11 +++++++++++ dlls/msi/msi.spec | 2 +- include/msi.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2b531da..ecc3e94 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4316,6 +4316,17 @@ UINT WINAPI MsiBeginTransactionW( LPCWSTR name, DWORD attrs, MSIHANDLE *id, HAND } /*********************************************************************** + * MsiJoinTransaction [MSI.@] + */ +UINT WINAPI MsiJoinTransaction( MSIHANDLE handle, DWORD attrs, HANDLE *event ) +{ + FIXME("%u %08x %p\n", handle, attrs, event); + + *event = (HANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/*********************************************************************** * MsiEndTransaction [MSI.@] */ UINT WINAPI MsiEndTransaction( DWORD state ) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 0ea9a27..d48f08b 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -280,7 +280,7 @@ 284 stdcall MsiBeginTransactionA(str long ptr ptr) 285 stdcall MsiBeginTransactionW(wstr long ptr ptr) 286 stdcall MsiEndTransaction(long) -287 stub MsiJoinTransaction +287 stdcall MsiJoinTransaction(long long ptr) 288 stub MsiSetOfflineContextW 289 stdcall MsiEnumComponentsExA(str long long ptr ptr ptr ptr) 290 stdcall MsiEnumComponentsExW(wstr long long ptr ptr ptr ptr) diff --git a/include/msi.h b/include/msi.h index 16189b0..6cbd26f 100644 --- a/include/msi.h +++ b/include/msi.h @@ -703,6 +703,7 @@ UINT WINAPI MsiBeginTransactionA(LPCSTR, DWORD, MSIHANDLE *, HANDLE *); UINT WINAPI MsiBeginTransactionW(LPCWSTR, DWORD, MSIHANDLE *, HANDLE *); #define MsiBeginTransaction WINELIB_NAME_AW(MsiBeginTransaction) +UINT WINAPI MsiJoinTransaction(MSIHANDLE, DWORD, HANDLE *); UINT WINAPI MsiEndTransaction(DWORD); /* Non Unicode */

1 0

Hans Leidekker : msi: Fix a couple of memory leaks (Coverity).
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: f9dc20cfcc5077f06a572ffc97b47eff07774014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9dc20cfcc5077f06a572ffc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 15 15:13:35 2015 +0200 msi: Fix a couple of memory leaks (Coverity). --- dlls/msi/table.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 700a61a..9c31992 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -809,7 +809,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, /* add each column to the _Columns table */ r = TABLE_CreateView( db, szColumns, &tv ); if( r ) - return r; + goto err; r = tv->ops->execute( tv, 0 ); TRACE("tv execute returned %x\n", r); @@ -2325,8 +2325,7 @@ err: } static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string_table *st, - IStorage *stg, - const BYTE *rawdata, UINT bytes_per_strref ) + IStorage *stg, const BYTE *rawdata, UINT bytes_per_strref ) { UINT i, val, ofs = 0; USHORT mask; @@ -2359,12 +2358,14 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string r = msi_record_encoded_stream_name( tv, rec, &encname ); if ( r != ERROR_SUCCESS ) + { + msiobj_release( &rec->hdr ); return NULL; - - r = IStorage_OpenStream( stg, encname, NULL, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); + } + r = IStorage_OpenStream( stg, encname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if ( r != ERROR_SUCCESS ) { + msiobj_release( &rec->hdr ); msi_free( encname ); return NULL; }

1 0

Hans Leidekker : msi: Check the return value of MSI_QueryGetRecord ( Coverity).
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 17405f6b91d310ec2dbb53f23eb6acc861817003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17405f6b91d310ec2dbb53f23… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 15 15:13:11 2015 +0200 msi: Check the return value of MSI_QueryGetRecord (Coverity). --- dlls/msi/action.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3ad387a..c90114c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3554,7 +3554,9 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (!comp->KeyPath || !(file = msi_get_loaded_file(package, comp->KeyPath))) continue; - row = MSI_QueryGetRecord(package->db, query, file->Sequence); + if (!(row = MSI_QueryGetRecord(package->db, query, file->Sequence))) + return ERROR_FUNCTION_FAILED; + sprintfW(source, fmt, MSI_RecordGetInteger(row, 1)); ptr2 = strrchrW(source, '\\') + 1; msiobj_release(&row->hdr);

1 0

Nikolay Sivov : dwrite: Partially implement GetGdiCompatibleGlyphAdvances( ).
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: e94d977006985536135fa0c4ce63a756e536e16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94d977006985536135fa0c4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 15 14:40:32 2015 +0300 dwrite: Partially implement GetGdiCompatibleGlyphAdvances(). --- dlls/dwrite/dwrite_private.h | 7 +++++++ dlls/dwrite/font.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a102e14..0111e46 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -92,6 +92,13 @@ static inline const char *debugstr_range(const DWRITE_TEXT_RANGE *range) return wine_dbg_sprintf("%u:%u", range->startPosition, range->length); } +static inline const char *debugstr_matrix(const DWRITE_MATRIX *m) +{ + if (!m) return "(null)"; + return wine_dbg_sprintf("{%.2f,%.2f,%.2f,%.2f,%.2f,%.2f}", m->m11, m->m12, m->m21, m->m22, + m->dx, m->dy); +} + static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch) { return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 41b0250..9b7a50f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -619,7 +619,7 @@ static void WINAPI dwritefontface1_GetMetrics(IDWriteFontFace2 *iface, DWRITE_FO static inline int round_metric(FLOAT metric) { - return (int)floor(metric + 0.5); + return (int)floorf(metric + 0.5f); } static HRESULT WINAPI dwritefontface1_GetGdiCompatibleMetrics(IDWriteFontFace2 *iface, FLOAT em_size, FLOAT pixels_per_dip, @@ -729,13 +729,33 @@ static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace2 *i } static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontFace2 *iface, - FLOAT em_size, FLOAT pixels_per_dip, const DWRITE_MATRIX *transform, BOOL use_gdi_natural, - BOOL is_sideways, UINT32 glyph_count, UINT16 const *indices, INT32 *advances) + FLOAT em_size, FLOAT ppdip, const DWRITE_MATRIX *m, BOOL use_gdi_natural, + BOOL is_sideways, UINT32 glyph_count, UINT16 const *glyphs, INT32 *advances) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%f %f %p %d %d %u %p %p): stub\n", This, em_size, pixels_per_dip, transform, - use_gdi_natural, is_sideways, glyph_count, indices, advances); - return E_NOTIMPL; + HRESULT hr; + UINT32 i; + + TRACE("(%p)->(%.2f %.2f %p %d %d %u %p %p)\n", This, em_size, ppdip, m, + use_gdi_natural, is_sideways, glyph_count, glyphs, advances); + + if (m && memcmp(m, &identity, sizeof(*m))) + FIXME("transform is not supported, %s\n", debugstr_matrix(m)); + + for (i = 0; i < glyph_count; i++) { + FLOAT scale; + + hr = IDWriteFontFace2_GetDesignGlyphAdvances(iface, 1, glyphs + i, advances + i, is_sideways); + if (FAILED(hr)) + return hr; + + scale = em_size * ppdip / This->metrics.designUnitsPerEm; +#define SCALE_METRIC(x) x = round_metric(round_metric((x) * scale) / scale) + SCALE_METRIC(advances[i]); +#undef SCALE_METRIC + } + + return S_OK; } static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 *iface, UINT32 count,

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015