February 2012 - Wine-commits

Dan Kegel : gdiplus: Make GdipTranslateLineTransform stub lie and return Ok .
by Alexandre Julliard 16 Feb '12

16 Feb '12

Module: wine Branch: master Commit: 8f073bf4c7f59a7c0164d46dc91386409d6bdc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f073bf4c7f59a7c0164d46dc… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Feb 11 15:29:56 2012 -0800 gdiplus: Make GdipTranslateLineTransform stub lie and return Ok. --- dlls/gdiplus/brush.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d1af903..ee1fd39 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -2017,9 +2017,14 @@ GpStatus WINGDIPAPI GdipMultiplyLineTransform(GpLineGradient *brush, GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient* brush, REAL dx, REAL dy, GpMatrixOrder order) { - FIXME("stub: %p %f %f %d\n", brush, dx, dy, order); + static int calls; - return NotImplemented; + TRACE("(%p,%f,%f,%d)\n", brush, dx, dy, order); + + if(!(calls++)) + FIXME("not implemented\n"); + + return Ok; } /******************************************************************************

1 0

André Hentschel : Remove link to Wines Status page as hint where to start coding
by Jeremy Newman 15 Feb '12

15 Feb '12

Module: website Branch: master Commit: 7a5d604b22a18c3559d40fca12747bbb297cc20b URL: http://source.winehq.org/git/website.git/?a=commit;h=7a5d604b22a18c3559d40f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 14 19:44:43 2012 +0100 Remove link to Wines Status page as hint where to start coding --- templates/de/contributing.template | 3 --- templates/en/contributing.template | 3 --- templates/he/contributing.template | 2 -- templates/pt/contributing.template | 3 --- 4 files changed, 0 insertions(+), 11 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index 8ea94e5..8e566f5 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -146,9 +146,6 @@ <h3 id="devel_task">Einige Entwicklungsaufgaben</h3> -<p>Der vollständige Implementierungsstatus kann auf der - <a href="{$root}/site/status">Wine Status Seite</a> überprüft werden.</p> - <h3 id="conf_tests">Konformitätstests</h3> <p>Das Ziel der Konformitätstests für Wine ist sicherzustellen, dass das Verhalten diff --git a/templates/en/contributing.template b/templates/en/contributing.template index 255aa5a..0ac8eb1 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -129,9 +129,6 @@ <h3 id="devel_task">Some development tasks</h3> -<p>The overall implementation status of Wine can be checked on the - <a href="{$root}/site/status">Wine Status page</a>.</p> - <h3 id="conf_tests">Conformance tests</h3> <p>The goal of Wine's conformance testing is to make sure that the behavior diff --git a/templates/he/contributing.template b/templates/he/contributing.template index 1a99900..594ddb2 100644 --- a/templates/he/contributing.template +++ b/templates/he/contributing.template @@ -129,8 +129,6 @@ <h3 id="devel_task">מספר משימות תכנותיות</h3> -<p>ניתן לצפות במצב ההטמעה הכללי של Wine ב<a href="{$root}/site/status">עמוד המצב של Wine</a>.</p> - <h3 id="conf_tests">בדיקות הסתגלות</h3> <p>The goal of Wine's conformance testing is to make sure that the behavior diff --git a/templates/pt/contributing.template b/templates/pt/contributing.template index 632ca94..772214f 100644 --- a/templates/pt/contributing.template +++ b/templates/pt/contributing.template @@ -136,9 +136,6 @@ <h3 id="devel_task">Algumas tarefas de desenvolvimento</h3> -<p>O estado geral da implementação do Wine pode ser verificado na página - <a href="{$root}/site/status">Wine Status</a>.</p> - <h3 id="conf_tests">Testes de Conformidade</h3> <p>O objectivo dos testes de conformidade do Wine é ter a certeza de que o

1 0

André Hentschel : Add Vector graphic skills as required for new Wine icons
by Jeremy Newman 15 Feb '12

15 Feb '12

Module: website Branch: master Commit: 872b1d79a9aec2c540764ac73dd86ed4b846733f URL: http://source.winehq.org/git/website.git/?a=commit;h=872b1d79a9aec2c540764a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 14 19:46:45 2012 +0100 Add Vector graphic skills as required for new Wine icons --- templates/de/contributing.template | 1 + templates/en/contributing.template | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index 8e566f5..dce380c 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -55,6 +55,7 @@ <p>Benötigte Fertigkeiten/Kenntnisse:</p> <ul> <li>Zeichnen</li> + <li>Vektor Grafiken</li> </ul> <h3 id="app_owners">AppDB: Werde verantwortlich für eine Anwendung</h3> diff --git a/templates/en/contributing.template b/templates/en/contributing.template index 0ac8eb1..d77819a 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -51,6 +51,7 @@ <p>Required skills:</p> <ul> <li>Drawing skills</li> + <li>Vector graphic skills</li> </ul> <h3 id="app_owners">Application database: application maintainers</h3>

1 0

Alexandre Julliard : user32: Fix GetKeyNameText returned length.
by Alexandre Julliard 15 Feb '12

15 Feb '12

Module: wine Branch: master Commit: f87191815deb5675f20e06c6bfdae402342f9290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87191815deb5675f20e06c6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 15 12:07:34 2012 +0100 user32: Fix GetKeyNameText returned length. --- dlls/user32/input.c | 5 ++++- dlls/user32/tests/input.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/keyboard.c | 29 ++++++++++++++++------------- 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index abd382f..050fb2b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -823,7 +823,7 @@ INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize) WCHAR buf[256]; INT ret; - if (!GetKeyNameTextW(lParam, buf, 256)) + if (!nSize || !GetKeyNameTextW(lParam, buf, 256)) { lpBuffer[0] = 0; return 0; @@ -834,6 +834,8 @@ INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize) ret = nSize - 1; lpBuffer[ret] = 0; } + else ret--; + return ret; } @@ -842,6 +844,7 @@ INT WINAPI GetKeyNameTextA(LONG lParam, LPSTR lpBuffer, INT nSize) */ INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize) { + if (!lpBuffer || !nSize) return 0; return USER_Driver->pGetKeyNameText( lParam, lpBuffer, nSize ); } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 748ed26..cb090dd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1603,6 +1603,46 @@ static void test_keyboard_layout_name(void) ok(!strcmp(klid, "00000409"), "expected 00000409, got %s\n", klid); } +static void test_key_names(void) +{ + char buffer[40]; + WCHAR bufferW[40]; + int ret, prev; + LONG lparam = 0x1d << 16; + + memset( buffer, 0xcc, sizeof(buffer) ); + ret = GetKeyNameTextA( lparam, buffer, sizeof(buffer) ); + ok( ret > 0, "wrong len %u for '%s'\n", ret, buffer ); + ok( ret == strlen(buffer), "wrong len %u for '%s'\n", ret, buffer ); + + memset( buffer, 0xcc, sizeof(buffer) ); + prev = ret; + ret = GetKeyNameTextA( lparam, buffer, prev ); + ok( ret == prev - 1, "wrong len %u for '%s'\n", ret, buffer ); + ok( ret == strlen(buffer), "wrong len %u for '%s'\n", ret, buffer ); + + memset( buffer, 0xcc, sizeof(buffer) ); + ret = GetKeyNameTextA( lparam, buffer, 0 ); + ok( ret == 0, "wrong len %u for '%s'\n", ret, buffer ); + ok( buffer[0] == 0, "wrong string '%s'\n", buffer ); + + memset( bufferW, 0xcc, sizeof(bufferW) ); + ret = GetKeyNameTextW( lparam, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + ok( ret > 0, "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + ok( ret == lstrlenW(bufferW), "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + + memset( bufferW, 0xcc, sizeof(bufferW) ); + prev = ret; + ret = GetKeyNameTextW( lparam, bufferW, prev ); + ok( ret == prev - 1, "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + ok( ret == lstrlenW(bufferW), "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + + memset( bufferW, 0xcc, sizeof(bufferW) ); + ret = GetKeyNameTextW( lparam, bufferW, 0 ); + ok( ret == 0, "wrong len %u for %s\n", ret, wine_dbgstr_w(bufferW) ); + ok( bufferW[0] == 0xcccc, "wrong string %s\n", wine_dbgstr_w(bufferW) ); +} + START_TEST(input) { init_function_pointers(); @@ -1621,6 +1661,7 @@ START_TEST(input) test_ToUnicode(); test_get_async_key_state(); test_keyboard_layout_name(); + test_key_names(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 57deb59..3b91d8f 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2291,7 +2291,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) (scanCode != 0x4a ) && /* numpad - */ (scanCode != 0x4e ) ) /* numpad + */ { - if ((nSize >= 2) && lpBuffer) + if (nSize >= 2) { *lpBuffer = toupperW((WCHAR)ansi); *(lpBuffer+1) = 0; @@ -2318,6 +2318,8 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) break; if (keyi <= max_keycode) { + INT rc; + wine_tsx11_lock(); keyc = (KeyCode) keyi; keys = keycode_to_keysym(display, keyc, 0); @@ -2329,29 +2331,30 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) char* idx = strrchr(name, '_'); if (idx && (strcasecmp(idx, "_r") == 0 || strcasecmp(idx, "_l") == 0)) { - INT rc = 0; TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", scanCode, keyc, keys, debugstr_an(name,idx-name)); - if (lpBuffer && nSize) - { - rc = MultiByteToWideChar(CP_UNIXCP, 0, name, idx-name+1, lpBuffer, nSize); - if (rc > 0) lpBuffer[rc - 1] = 0; - } + rc = MultiByteToWideChar(CP_UNIXCP, 0, name, idx-name+1, lpBuffer, nSize); + if (!rc) rc = nSize; + lpBuffer[--rc] = 0; return rc; } } - TRACE("found scan=%04x keyc=%u keysym=%04x string=%s\n", - scanCode, keyc, (int)keys, debugstr_a(name)); - if (lpBuffer && nSize && name) - return MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); + if (name) + { + TRACE("found scan=%04x keyc=%u keysym=%04x vkey=%04x string=%s\n", + scanCode, keyc, (int)keys, vkey, debugstr_a(name)); + rc = MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); + if (!rc) rc = nSize; + lpBuffer[--rc] = 0; + return rc; + } } /* Finally issue WARN for unknown keys */ WARN("(%08x,%p,%d): unsupported key, vkey=%04X, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi); - if (lpBuffer && nSize) - *lpBuffer = 0; + *lpBuffer = 0; return 0; }

1 0

Christian Costa : d3dxof: Enable retrieving a particular member in GetData + tests.
by Alexandre Julliard 15 Feb '12

15 Feb '12

Module: wine Branch: master Commit: d581f1bf7d2f306ed5803984c300301a758361dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d581f1bf7d2f306ed5803984c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Feb 15 09:53:19 2012 +0100 d3dxof: Enable retrieving a particular member in GetData + tests. --- dlls/d3dxof/d3dxof.c | 21 ++++++++++++++++----- dlls/d3dxof/parsing.c | 3 +++ dlls/d3dxof/tests/d3dxof.c | 28 +++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 966baa2..3294f92 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -616,12 +616,23 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetData(IDirectXFileData* iface, LPCS if (szMember) { - FIXME("Specifying a member is not supported yet!\n"); - return DXFILEERR_BADVALUE; + int i; + for (i = 0; i < This->pobj->nb_members; i++) + if (!strcmp(This->pobj->members[i].name, szMember)) + break; + if (i == This->pobj->nb_members) + { + WARN("Unknown member '%s'\n", szMember); + return DXFILEERR_BADDATAREFERENCE; + } + *pcbSize = This->pobj->members[i].size; + *ppvData = This->pobj->root->pdata + This->pobj->members[i].start; + } + else + { + *pcbSize = This->pobj->size; + *ppvData = This->pobj->root->pdata + This->pobj->pos_data; } - - *pcbSize = This->pobj->size; - *ppvData = This->pobj->root->pdata + This->pobj->pos_data; return DXFILE_OK; } diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 5b8b44b..4b9b12f 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1149,6 +1149,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) int i; xtemplate* pt = buf->pxt[buf->level]; + buf->pxo->nb_members = pt->nb_members; + for (i = 0; i < pt->nb_members; i++) { int k; @@ -1295,6 +1297,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) return FALSE; } + buf->pxo->members[i].size = buf->cur_pos_data - buf->pxo->members[i].start; } return TRUE; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index daded96..8ce22b7 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -204,12 +204,38 @@ static void test_CreateEnumObject(void) hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + /* Get all data (szMember == NULL) */ hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&pdata); ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - ok(size == 8, "Retrieved data size is wrong\n"); + ok(size == 8, "Retrieved data size is wrong (%u instead of 8)\n", size); ok((*((WORD*)pdata) == 1) && (*((WORD*)(pdata+2)) == 2) && (*((DWORD*)(pdata+4)) == 3), "Retrieved data is wrong\n"); + /* Get only "major" member (szMember == "major") */ + hr = IDirectXFileData_GetData(lpdxfd, "major", &size, (void**)&pdata); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + + ok(size == 2, "Retrieved data size is wrong (%u instead of 2)\n", size); + ok(*((WORD*)pdata) == 1, "Retrieved data is wrong (%u instead of 1)\n", *((WORD*)pdata)); + + /* Get only "minor" member (szMember == "minor") */ + hr = IDirectXFileData_GetData(lpdxfd, "minor", &size, (void**)&pdata); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + + ok(size == 2, "Retrieved data size is wrong (%u instead of 2)\n", size); + ok(*((WORD*)pdata) == 2, "Retrieved data is wrong (%u instead of 2)\n", *((WORD*)pdata)); + + /* Get only "flags" member (szMember == "flags") */ + hr = IDirectXFileData_GetData(lpdxfd, "flags", &size, (void**)&pdata); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + + ok(size == 4, "Retrieved data size is wrong (%u instead of 4)\n", size); + ok(*((WORD*)pdata) == 3, "Retrieved data is wrong (%u instead of 3)\n", *((WORD*)pdata)); + + /* Try to get not existing member (szMember == "unknown") */ + hr = IDirectXFileData_GetData(lpdxfd, "unknow", &size, (void**)&pdata); + ok(hr == DXFILEERR_BADDATAREFERENCE, "IDirectXFileData_GetData: %x\n", hr); + ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(ref == 0, "Got refcount %d, expected 0\n", ref);

1 0

Kusanagi Kouichi : gdi32: Use find_family_from_any_name to find a replacement family.
by Alexandre Julliard 15 Feb '12

15 Feb '12

Module: wine Branch: master Commit: 15a6aefb8f46085652024de13bc6d3548c824d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a6aefb8f46085652024de13… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Feb 15 19:40:34 2012 +0900 gdi32: Use find_family_from_any_name to find a replacement family. --- dlls/gdi32/freetype.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6677c12..8caa441 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1880,9 +1880,6 @@ static void LoadReplaceList(void) DWORD valuelen, datalen, i = 0, type, dlen, vlen; LPWSTR value; LPVOID data; - Family *family; - Face *face; - struct list *family_elem_ptr, *face_elem_ptr; CHAR familyA[400]; /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ @@ -1907,19 +1904,18 @@ static void LoadReplaceList(void) { /* Find the old family and hence all of the font files in that family */ - LIST_FOR_EACH(family_elem_ptr, &font_list) { - family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(family->FamilyName, data) || (family->EnglishName && !strcmpiW(family->EnglishName, data))) { - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), - debugstr_w(face->StyleName), familyA); - /* Now add a new entry with the new family name */ - AddFontToList(face->file, face->font_data_ptr, face->font_data_size, - familyA, family->FamilyName, - ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); - } - break; + const Family * const family = find_family_from_any_name(data); + if (family != NULL) + { + const struct list *face_elem_ptr; + LIST_FOR_EACH(face_elem_ptr, &family->faces) { + const Face * const face = LIST_ENTRY(face_elem_ptr, Face, entry); + TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), + debugstr_w(face->StyleName), familyA); + /* Now add a new entry with the new family name */ + AddFontToList(face->file, face->font_data_ptr, face->font_data_size, + familyA, family->FamilyName, + ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); } } }

1 0

Kusanagi Kouichi : gdi32: Add traces for skipped font replacements.
by Alexandre Julliard 15 Feb '12

15 Feb '12

Module: wine Branch: master Commit: 758796e704d72e3f32f7f73d973c156deabe2033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758796e704d72e3f32f7f73d9… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Feb 15 19:40:52 2012 +0900 gdi32: Add traces for skipped font replacements. --- dlls/gdi32/freetype.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8caa441..8d99d64 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1918,6 +1918,14 @@ static void LoadReplaceList(void) ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); } } + else + { + TRACE("%s is not available. Skip this replacement.\n", debugstr_w(data)); + } + } + else + { + TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); } /* reset dlen and vlen */ dlen = datalen;

1 0

André Hentschel : po: Fix German translation.
by Alexandre Julliard 15 Feb '12

15 Feb '12

Module: wine Branch: master Commit: 64e2d263d9f62f35ec772e07f07073d51dc5bc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e2d263d9f62f35ec772e07f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 14 21:03:12 2012 +0100 po: Fix German translation. --- po/de.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 7cb7b86..f133091 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-12 18:12+0100\n" +"PO-Revision-Date: 2012-02-14 21:02+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -9659,7 +9659,7 @@ msgstr "" "/M[inimized] Starte das Programm minimiert.\n" "/MAX[imized] Starte das Programm maximiert.\n" "/R[estored] Starte das Programm normal (weder minimiert noch maximiert).\n" -"/W[ait] Wartet bis das gestartete Programm sich beendet, dannbeendet " +"/W[ait] Wartet bis das gestartete Programm sich beendet, dann beendet " "sich start mit dessen Exitcode des Programmes.\n" "/Unix Einen Unix Dateinamen wie mit dem Explorer öffnen.\n" "/ProgIDOpen Öffne ein Dokument mit der folgenden progID.\n" @@ -11496,7 +11496,7 @@ msgstr "" "/M[inimized] Starte das Programm minimiert.\n" "/MAX[imized] Starte das Programm maximiert.\n" "/R[estored] Starte das Programm normal (weder minimiert noch maximiert).\n" -"/W[ait] Wartet bis das gestartete Programm sich beendet, dannbeendet " +"/W[ait] Wartet bis das gestartete Programm sich beendet, dann beendet " "sich start mit dessen Exitcode des Programmes.\n" "/Unix Einen Unix Dateinamen wie mit dem Explorer öffnen.\n" "/ProgIDOpen Öffne ein Dokument mit der folgenden progID.\n"

1 0

Alexandre Julliard : user32: Add mouse tracking on caption right-clicks to avoid messing with the capture .
by Alexandre Julliard 15 Feb '12

15 Feb '12

Module: wine Branch: master Commit: 5d1a1471636c793e75cdd1ac8a52a6d98d8c9a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d1a1471636c793e75cdd1ac8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 15 14:26:00 2012 +0100 user32: Add mouse tracking on caption right-clicks to avoid messing with the capture. --- dlls/user32/controls.h | 1 + dlls/user32/defwnd.c | 12 +----------- dlls/user32/nonclient.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 66d6659..6bd946b 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -170,6 +170,7 @@ extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DE extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSetCursor( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 226b604..0ac308c 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -334,21 +334,11 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return NC_HandleNCLButtonDblClk( hwnd, wParam, lParam ); case WM_NCRBUTTONDOWN: - /* in Windows, capture is taken when right-clicking on the caption bar */ - if (wParam==HTCAPTION) - { - SetCapture(hwnd); - } - break; + return NC_HandleNCRButtonDown( hwnd, wParam, lParam ); case WM_RBUTTONUP: { POINT pt; - - if (hwnd == GetCapture()) - /* release capture if we took it on WM_NCRBUTTONDOWN */ - ReleaseCapture(); - pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); ClientToScreen(hwnd, &pt); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 6bef9ff..5ca0a8d 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1462,6 +1462,44 @@ LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) /*********************************************************************** + * NC_HandleNCRButtonDown + * + * Handle a WM_NCRBUTTONDOWN message. Called from DefWindowProc(). + */ +LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) +{ + MSG msg; + INT hittest = wParam; + HMENU hSysMenu = GetSystemMenu(hwnd, FALSE); + + switch (hittest) + { + case HTCAPTION: + case HTSYSMENU: + hSysMenu = GetSystemMenu(hwnd, FALSE); + if (!hSysMenu) break; + + SetCapture( hwnd ); + for (;;) + { + if (!GetMessageW( &msg, 0, WM_MOUSEFIRST, WM_MOUSELAST )) break; + if (CallMsgFilterW( &msg, MSGF_MAX )) continue; + if (msg.message == WM_RBUTTONUP) + { + hittest = NC_HandleNCHitTest( hwnd, msg.pt ); + break; + } + } + ReleaseCapture(); + if (hittest == HTCAPTION || hittest == HTSYSMENU) + SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, msg.lParam ); + break; + } + return 0; +} + + +/*********************************************************************** * NC_HandleNCLButtonDblClk * * Handle a WM_NCLBUTTONDBLCLK message. Called from DefWindowProc().

1 0

Alexandre Julliard : dinput: Filter out mouse wheel messages in exclusive mode.
by Alexandre Julliard 15 Feb '12

15 Feb '12

Module: wine Branch: master Commit: 011a3523aa2921c03766155e8669e08db4a6989f URL: http://source.winehq.org/git/wine.git/?a=commit;h=011a3523aa2921c03766155e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 15 19:13:34 2012 +0100 dinput: Filter out mouse wheel messages in exclusive mode. --- dlls/dinput/mouse.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index f78ae23..7cac0fc 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -319,7 +319,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = impl_from_IDirectInputDevice8A(iface); - int wdata = 0, inst_id = -1; + int wdata = 0, inst_id = -1, ret = 0; TRACE("msg %lx @ (%d %d)\n", wparam, hook->pt.x, hook->pt.y); @@ -367,6 +367,9 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM case WM_MOUSEWHEEL: inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Z_AXIS_INSTANCE) | DIDFT_RELAXIS; This->m_state.lZ += wdata = (short)HIWORD(hook->mouseData); + /* FarCry crashes if it gets a mouse wheel message */ + /* FIXME: should probably filter out other messages too */ + ret = This->clipped; break; case WM_LBUTTONDOWN: inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_BUTTONS_INSTANCE + 0) | DIDFT_PSHBUTTON; @@ -411,7 +414,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM } LeaveCriticalSection(&This->base.crit); - return 0; + return ret; } static void warp_check( SysMouseImpl* This, BOOL force )

1 0