February 2012 - Wine-Commits

William Panlener : kernel32: Add missing function entry.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: b21baaeb6e80cfa13ac5ed89119e5a9ede154403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21baaeb6e80cfa13ac5ed891… Author: William Panlener <wpanlener(a)gmail.com> Date: Sun Feb 12 23:17:02 2012 -0600 kernel32: Add missing function entry. --- dlls/kernel32/kernel32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 072cfa1..fb3f9c2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1019,6 +1019,7 @@ @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory

1 0

André Hentschel : Add Vector graphic skills as required for new Wine icons
by Jeremy Newman Feb. 15, 2012

Feb. 15, 2012

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

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

Feb. 15, 2012

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

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

Feb. 15, 2012

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

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

Feb. 15, 2012

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

Michael Stefaniuc : dsound/tests: Fix the capture COM tests for older Win2k versions.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: 0872572a6d12b0ff82cca9f07dc0b5e861a49510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0872572a6d12b0ff82cca9f07… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 13 21:37:38 2012 +0100 dsound/tests: Fix the capture COM tests for older Win2k versions. --- dlls/dsound/tests/capture.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index cb53a02..96fb417 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -695,9 +695,15 @@ static void test_COM(void) bufdesc.lpwfxFormat = &wfx; hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, (IUnknown*)0xdeadbeef); + if (hr == E_INVALIDARG) { + /* Old DirectX has only the 1st version of the DSCBUFFERDESC struct */ + bufdesc.dwSize = sizeof(DSCBUFFERDESC1); + hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, (IUnknown*)0xdeadbeef); + } ok(hr == DSERR_NOAGGREGATION, "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DSERR_NOAGGREGATION\n", hr); - ok(buffer == (IDirectSoundCaptureBuffer*)0xdeadbeef, "buffer = %p\n", buffer); + ok(buffer == (IDirectSoundCaptureBuffer*)0xdeadbeef || !buffer /* Win2k without DirectX9 */, + "buffer = %p\n", buffer); hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, NULL); ok(hr == DS_OK, "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DS_OK\n", hr);

1 0

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

Feb. 15, 2012

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 Feb. 15, 2012

Feb. 15, 2012

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

Erich Hoover : hhctrl.ocx: Fix parsing of some TOC topics that reference other files.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: 98f0be8dc3d70cde04cf6e93c5338775a66c24aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f0be8dc3d70cde04cf6e93c… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Feb 13 11:45:29 2012 -0700 hhctrl.ocx: Fix parsing of some TOC topics that reference other files. --- dlls/hhctrl.ocx/content.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 2dad7c8..9f468a2 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -50,11 +50,21 @@ static void free_content_item(ContentItem *item) } } +static void store_param(LPWSTR *param, const char *value, int len) +{ + int wlen; + + wlen = MultiByteToWideChar(CP_ACP, 0, value, len, NULL, 0); + *param = heap_alloc((wlen+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, value, len, *param, wlen); + (*param)[wlen] = 0; +} + static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const char *text) { const char *ptr; LPWSTR *param, merge; - int len, wlen; + int len; ptr = get_attr(text, "name", &len); if(!ptr) { @@ -79,10 +89,21 @@ static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const return; } - wlen = MultiByteToWideChar(CP_ACP, 0, ptr, len, NULL, 0); - *param = heap_alloc((wlen+1)*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ptr, len, *param, wlen); - (*param)[wlen] = 0; + /* + * "merge" parameter data (referencing another CHM file) can be incorporated into the "local" parameter + * by specifying the filename in the format: + * MS-ITS:file.chm::/local_path.htm + */ + if(param == &item->local && strstr(ptr, "::")) + { + const char *local = strstr(ptr, "::")+2; + int local_len = len-(local-ptr); + + store_param(&item->local, local, local_len); + param = &merge; + } + + store_param(param, ptr, len); if(param == &merge) { SetChmPath(&item->merge, hhc_root->merge.chm_file, merge);

1 0

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

Feb. 15, 2012

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 : user32: Fix GetKeyNameText returned length.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

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 Feb. 15, 2012

Feb. 15, 2012

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

Andrew Eikum : mmdevapi: Only return ACTIVE devices from GetDefaultAudioEndpoint.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: f7d37b38fe5914cb81f0fbca3902b0862eb842d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d37b38fe5914cb81f0fbca3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 14 11:50:05 2012 -0600 mmdevapi: Only return ACTIVE devices from GetDefaultAudioEndpoint. This prevents invalid devices from being created if the user adds a device, sets it as default, and then removes it. --- dlls/mmdevapi/devenum.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 06a1adf..ba55368 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -942,7 +942,7 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa if(RegOpenKeyW(HKEY_CURRENT_USER, reg_key, &key) == ERROR_SUCCESS){ const WCHAR *reg_x_name, *reg_vx_name; WCHAR def_id[256]; - DWORD size = sizeof(def_id); + DWORD size = sizeof(def_id), state; if(flow == eRender){ reg_x_name = reg_out_nameW; @@ -957,8 +957,11 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa (BYTE*)def_id, &size) == ERROR_SUCCESS){ hr = IMMDeviceEnumerator_GetDevice(iface, def_id, device); if(SUCCEEDED(hr)){ - RegCloseKey(key); - return S_OK; + if(SUCCEEDED(IMMDevice_GetState(*device, &state)) && + state == DEVICE_STATE_ACTIVE){ + RegCloseKey(key); + return S_OK; + } } TRACE("Unable to find voice device %s\n", wine_dbgstr_w(def_id)); @@ -968,8 +971,11 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa (BYTE*)def_id, &size) == ERROR_SUCCESS){ hr = IMMDeviceEnumerator_GetDevice(iface, def_id, device); if(SUCCEEDED(hr)){ - RegCloseKey(key); - return S_OK; + if(SUCCEEDED(IMMDevice_GetState(*device, &state)) && + state == DEVICE_STATE_ACTIVE){ + RegCloseKey(key); + return S_OK; + } } TRACE("Unable to find device %s\n", wine_dbgstr_w(def_id));

1 0

André Hentschel : advapi32/tests: Add a test to cover second RegSetValueW Parameter (gcov).
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: c2c3b51650a8ebda2e4af2150bd1b7041a1ea8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c3b51650a8ebda2e4af2150… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 14 20:35:09 2012 +0100 advapi32/tests: Add a test to cover second RegSetValueW Parameter (gcov). --- dlls/advapi32/tests/registry.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 60bc451..c0a7ebf 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -353,7 +353,12 @@ static void test_set_value(void) test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); test_hkey_main_Value_W(NULL, string1W, sizeof(string1W)); - /* RegSetValueA ignores the size passed in */ + ret = RegSetValueW(hkey_main, name1W, REG_SZ, string1W, sizeof(string1W)); + ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A, sizeof(string1A)); + test_hkey_main_Value_W(name1W, string1W, sizeof(string1W)); + + /* RegSetValueW ignores the size passed in */ ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, 4 * sizeof(string1W[0])); ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); test_hkey_main_Value_A(NULL, string1A, sizeof(string1A));

1 0

André Hentschel : winefile: Fix collapsing when there' s no parent directory.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: 7476bb0556de553e690367e4d2faff994cd57457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7476bb0556de553e690367e4d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 14 19:33:54 2012 +0100 winefile: Fix collapsing when there's no parent directory. --- programs/winefile/winefile.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 63ce463..52e1bc4 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3563,7 +3563,10 @@ static BOOL expand_entry(ChildWnd* child, Entry* dir) static void collapse_entry(Pane* pane, Entry* dir) { - int idx = SendMessageW(pane->hwnd, LB_FINDSTRING, 0, (LPARAM)dir); + int idx; + + if (!dir) return; + idx = SendMessageW(pane->hwnd, LB_FINDSTRING, 0, (LPARAM)dir); ShowWindow(pane->hwnd, SW_HIDE);

1 0

Jeremy White : oleaut32: When marshalling VT_CARRAY, only marshall by reference for appropriate types.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: 4f5271a17f07b169012168fd81951938bb68e5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f5271a17f07b169012168fd8… Author: Jeremy White <jwhite(a)winehq.org> Date: Tue Feb 14 14:59:48 2012 -0600 oleaut32: When marshalling VT_CARRAY, only marshall by reference for appropriate types. --- dlls/oleaut32/tests/tmarshal.c | 34 ++++++++++++++++++++++++---------- dlls/oleaut32/tests/tmarshal.idl | 1 + dlls/oleaut32/tmarshal.c | 23 ++++++++++++++++++++--- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index e261464..b491e53 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -37,14 +37,14 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) -const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432)}; -const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211)}; +const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432), {0,1,2,3,4,5,6,7}}; +const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211), {0,1,2,3,4,5,6,7}}; const MYSTRUCT MYSTRUCT_ARRAY[5] = { - {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415)}, - {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425)}, - {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435)}, - {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445)}, - {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455)}, + {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415), {0,1,2,3,4,5,6,7}}, + {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425), {0,1,2,3,4,5,6,7}}, + {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435), {0,1,2,3,4,5,6,7}}, + {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445), {0,1,2,3,4,5,6,7}}, + {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455), {0,1,2,3,4,5,6,7}}, }; @@ -563,6 +563,17 @@ static HRESULT WINAPI Widget_VarArg( return S_OK; } + +static BOOL mystruct_uint_ordered(UINT uarr[8]) +{ + int i; + for (i = 0; i < sizeof(uarr) / sizeof(uarr[0]); i++) + if (uarr[i] != i) + return 0; + + return 1; +} + static HRESULT WINAPI Widget_StructArgs( IWidget * iface, MYSTRUCT byval, @@ -571,14 +582,17 @@ static HRESULT WINAPI Widget_StructArgs( { int i, diff = 0; ok(byval.field1 == MYSTRUCT_BYVAL.field1 && - byval.field2 == MYSTRUCT_BYVAL.field2, + byval.field2 == MYSTRUCT_BYVAL.field2 && + mystruct_uint_ordered(byval.uarr), "Struct parameter passed by value corrupted\n"); ok(byptr->field1 == MYSTRUCT_BYPTR.field1 && - byptr->field2 == MYSTRUCT_BYPTR.field2, + byptr->field2 == MYSTRUCT_BYPTR.field2 && + mystruct_uint_ordered(byptr->uarr), "Struct parameter passed by pointer corrupted\n"); for (i = 0; i < 5; i++) if (arr[i].field1 != MYSTRUCT_ARRAY[i].field1 || - arr[i].field2 != MYSTRUCT_ARRAY[i].field2) + arr[i].field2 != MYSTRUCT_ARRAY[i].field2 || + ! mystruct_uint_ordered(arr[i].uarr)) diff++; ok(diff == 0, "Array of structs corrupted\n"); return S_OK; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 88c13bf..a26589d 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -39,6 +39,7 @@ library TestTypelib { INT field1; ULONGLONG field2; + UINT uarr[8]; } MYSTRUCT; coclass ApplicationObject2; diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 1549d97..44a6d44 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -638,6 +638,17 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { } } +/* Whether we pass this type by reference or by value */ +static int +_passbyref(const TYPEDESC *td, ITypeInfo *tinfo) { + if (td->vt == VT_USERDEFINED || + td->vt == VT_VARIANT || + td->vt == VT_PTR) + return 1; + + return 0; +} + static HRESULT serialize_param( ITypeInfo *tinfo, @@ -892,7 +903,8 @@ serialize_param( if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt)); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { - hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)(*arg)+i*_xsize(&adesc->tdescElem, tinfo)), buf); + LPBYTE base = _passbyref(&adesc->tdescElem, tinfo) ? (LPBYTE) *arg : (LPBYTE) arg; + hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)base+i*_xsize(&adesc->tdescElem, tinfo)), buf); if (hres) return hres; if (debugout && (i<arrsize-1)) TRACE_(olerelay)(","); @@ -1172,13 +1184,18 @@ deserialize_param( } case VT_CARRAY: { /* arg is pointing to the start of the array. */ + LPBYTE base = (LPBYTE) arg; ARRAYDESC *adesc = tdesc->u.lpadesc; int arrsize,i; arrsize = 1; if (adesc->cDims > 1) FIXME("cDims > 1 in VT_CARRAY. Does it work?\n"); for (i=0;i<adesc->cDims;i++) arrsize *= adesc->rgbounds[i].cElements; - *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize); + if (_passbyref(&adesc->tdescElem, tinfo)) + { + base = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize); + *arg = (DWORD) base; + } for (i=0;i<arrsize;i++) deserialize_param( tinfo, @@ -1186,7 +1203,7 @@ deserialize_param( debugout, alloc, &adesc->tdescElem, - (DWORD*)((LPBYTE)(*arg)+i*_xsize(&adesc->tdescElem, tinfo)), + (DWORD*)(base + i*_xsize(&adesc->tdescElem, tinfo)), buf ); return S_OK;

1 0

Andrew Eikum : winealsa.drv: Optionally load extra ALSA device names from the registry.
by Alexandre Julliard Feb. 15, 2012

Feb. 15, 2012

Module: wine Branch: master Commit: 73cdf6530c2e463554194e11233c57251dc61a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cdf6530c2e463554194e112… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 14 15:28:29 2012 -0600 winealsa.drv: Optionally load extra ALSA device names from the registry. --- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winealsa.drv/mmdevdrv.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 336da8b..7086ce6 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winealsa.drv -IMPORTS = uuid ole32 +IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = @ALSALIBS@ diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7621423..0f710a5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -340,6 +340,57 @@ static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char return S_OK; } +static void get_reg_devices(snd_pcm_stream_t stream, WCHAR **ids, char **keys, + UINT *num) +{ + static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', + 'w','i','n','e','a','l','s','a','.','d','r','v',0}; + static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; + static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; + HKEY key; + WCHAR reg_devices[256]; + DWORD size = sizeof(reg_devices), type, len; + const WCHAR *value_name = (stream == SND_PCM_STREAM_PLAYBACK) ? ALSAOutputDevices : ALSAInputDevices; + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ + if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ + if(RegQueryValueExW(key, value_name, 0, &type, + (BYTE*)reg_devices, &size) == ERROR_SUCCESS){ + WCHAR *p = reg_devices; + + if(type != REG_MULTI_SZ){ + ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); + RegCloseKey(key); + return; + } + + while(*p){ + char devname[64]; + + WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); + + if(alsa_try_open(devname, stream)){ + if(ids && keys){ + len = lstrlenW(p) + 1; + ids[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + memcpy(ids[*num], p, len * sizeof(WCHAR)); + + len = strlen(devname) + 1; + keys[*num] = HeapAlloc(GetProcessHeap(), 0, len); + memcpy(keys[*num], devname, len); + } + ++*num; + } + + p += lstrlenW(p) + 1; + } + } + + RegCloseKey(key); + } +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, UINT *num) { @@ -360,6 +411,8 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, ++*num; } + get_reg_devices(stream, ids, keys, num); + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64];

1 0

Andrew Eikum : dsound: Add some more DSCAPS flags.
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: 9d06d41e37e124a95f095ecb4a61a44cb545fc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d06d41e37e124a95f095ecb4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 14 09:40:38 2012 -0600 dsound: Add some more DSCAPS flags. --- dlls/dsound/dsound.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 305bfeb0..444b933 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1480,6 +1480,11 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG DSOUND_check_supported(device->client, 96000, 16, 2)) device->drvcaps.dwFlags |= DSCAPS_PRIMARY16BIT | DSCAPS_PRIMARYSTEREO; + /* the dsound mixer supports all of the following */ + device->drvcaps.dwFlags |= DSCAPS_SECONDARY8BIT | DSCAPS_SECONDARY16BIT; + device->drvcaps.dwFlags |= DSCAPS_SECONDARYMONO | DSCAPS_SECONDARYSTEREO; + device->drvcaps.dwFlags |= DSCAPS_CONTINUOUSRATE; + device->drvcaps.dwPrimaryBuffers = 1; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX;

1 0

Akihiro Sagawa : comdlg32: Apply 3D effects to sample text area.
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: 0352a7089cfbea4ef68da89e2616a62e0920f2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0352a7089cfbea4ef68da89e2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Feb 14 23:38:14 2012 +0900 comdlg32: Apply 3D effects to sample text area. --- dlls/comdlg32/comdlg32.rc | 2 +- dlls/comdlg32/fontdlg.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc index d1f95b5..13c544a 100644 --- a/dlls/comdlg32/comdlg32.rc +++ b/dlls/comdlg32/comdlg32.rc @@ -264,7 +264,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP - CTEXT "",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 8068e82..c081e91 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1115,7 +1115,6 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE { PAINTSTRUCT ps; HDC hdc; - HPEN hOrigPen; HFONT hOrigFont; LOGFONTW lf = *(lpcf->lpLogFont); @@ -1127,22 +1126,9 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE ps.rcPaint.right, ps.rcPaint.bottom); /* Paint frame */ - MoveToEx( hdc, info.rcWindow.left, info.rcWindow.bottom, NULL ); - hOrigPen=SelectObject( hdc, CreatePen( PS_SOLID, 2, - GetSysColor( COLOR_3DSHADOW ) )); - LineTo( hdc, info.rcWindow.left, info.rcWindow.top ); - LineTo( hdc, info.rcWindow.right, info.rcWindow.top ); - DeleteObject(SelectObject( hdc, CreatePen( PS_SOLID, 2, - GetSysColor( COLOR_3DLIGHT ) ))); - LineTo( hdc, info.rcWindow.right, info.rcWindow.bottom ); - LineTo( hdc, info.rcWindow.left, info.rcWindow.bottom ); - DeleteObject(SelectObject( hdc, hOrigPen )); + DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST ); /* Draw the sample text itself */ - info.rcWindow.right--; - info.rcWindow.bottom--; - info.rcWindow.top++; - info.rcWindow.left++; hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); SetTextColor( hdc, lpcf->rgbColors );

1 0

Christian Costa : d3dxof: Enable dumping of input x files and templates.
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: 8bbf1344c9f5c3f8a40e87e1e2c050ba314a5d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bbf1344c9f5c3f8a40e87e1e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Feb 13 22:12:29 2012 +0100 d3dxof: Enable dumping of input x files and templates. --- dlls/d3dxof/d3dxof.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 38882a8..966baa2 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -32,6 +32,7 @@ #include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); +WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump); static const struct IDirectXFileVtbl IDirectXFile_Vtbl; static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; @@ -215,6 +216,21 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV TRACE("File size is %d bytes\n", file_size); + if (TRACE_ON(d3dxof_dump)) + { + static USHORT num; + char tmp[12]; + HANDLE file; + sprintf(tmp, "file%05u.x", num++); + + file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + WriteFile(file, file_buffer, file_size, NULL, NULL); + CloseHandle(file); + } + } + object->pDirectXFile = This; object->buf.pdxf = This; @@ -284,6 +300,21 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (!pvData) return DXFILEERR_BADVALUE; + if (TRACE_ON(d3dxof_dump)) + { + static USHORT num; + char tmp[16]; + HANDLE file; + sprintf(tmp, "template%05u.x", num++); + + file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + WriteFile(file, pvData, cbSize, NULL, NULL); + CloseHandle(file); + } + } + hr = parse_header(&buf, &decomp_buffer); if (FAILED(hr)) goto cleanup;

1 0

Francois Gouget : po: Remove English strings and invalid translations from the Romanian translation .
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: e2b38c3ffd5f19c6bc4cbeb5a676d19e5740e47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b38c3ffd5f19c6bc4cbeb5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 14 12:43:36 2012 +0100 po: Remove English strings and invalid translations from the Romanian translation. --- po/ro.po | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/po/ro.po b/po/ro.po index dbb8532..42ac763 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3203,7 +3203,7 @@ msgstr "Pre&vizualizare imprimare" #: ieframe.rc:44 msgid "&Toolbars" -msgstr "&Despre Internet Explorer..." +msgstr "" #: ieframe.rc:46 msgid "&Standard bar" @@ -8112,23 +8112,19 @@ msgstr "Filmele mele" #, fuzzy msgctxt "directory" msgid "Desktop" -msgstr "" -"#-#-#-#-# ro.po (Wine) #-#-#-#-#\n" -"Desktop\n" -"#-#-#-#-# ro.po (Wine) #-#-#-#-#\n" -"Birou" +msgstr "Birou" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8136,11 +8132,11 @@ msgstr "Istorie" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 msgid "My Pictures" -msgstr "My Pictures" +msgstr "" #: shell32.rc:215 #, fuzzy @@ -8154,24 +8150,26 @@ msgstr "Documente" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Meniu Start\\Programe\\Scule administrative" +msgstr "Scule administrative" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Documente\\Muzica mea" +msgstr "Muzica mea" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Documente\\Pozele mele" +msgstr "Pozele mele" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Documente\\Filmele mele" +msgstr "Filmele mele" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 msgid "Contacts" @@ -13852,7 +13850,7 @@ msgstr "În&totdeauna deasupra" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Informații..." +msgstr "" #: winhlp32.rc:64 msgid "Annotation..."

1 0

Michael Stefaniuc : po: Don' t use s and t with cedilla in the Romanian translation.
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: ff0cff7863c0dbdf4a3b7ee9dce63adade3e6a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0cff7863c0dbdf4a3b7ee9d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 14 11:42:42 2012 +0100 po: Don't use s and t with cedilla in the Romanian translation. --- po/ro.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/po/ro.po b/po/ro.po index c60e573..455a612 100644 --- a/po/ro.po +++ b/po/ro.po @@ -449,7 +449,7 @@ msgstr "&Calitate tipărire:" #: comdlg32.rc:211 msgid "Print to Fi&le" -msgstr "Tipăreşte în fişier" +msgstr "Tipărește în fișier" #: comdlg32.rc:212 msgid "Condensed" @@ -627,19 +627,19 @@ msgstr "Înlocuire" #: comdlg32.rc:334 msgid "Re&place With:" -msgstr "În&locuieşte cu:" +msgstr "În&locuiește cu:" #: comdlg32.rc:340 msgid "&Replace" -msgstr "&Înlocuieşte" +msgstr "&Înlocuiește" #: comdlg32.rc:341 msgid "Replace &All" -msgstr "Înlocuieşte &tot" +msgstr "Înlocuiește &tot" #: comdlg32.rc:358 msgid "Print to fi&le" -msgstr "Tipăreşte în &fişier" +msgstr "Tipărește în &fișier" #: comdlg32.rc:359 comdlg32.rc:397 ieframe.rc:39 shdoclc.rc:58 shell32.rc:105 #: clock.rc:28 wineconsole.rc:27 @@ -787,7 +787,7 @@ msgid "" "File does not exist.\n" "Do you want to create file?" msgstr "" -"Fişierul nu există.\n" +"Fișierul nu există.\n" "Doriți să creați acest fișier?" #: comdlg32.rc:32 @@ -816,7 +816,7 @@ msgstr "Calea nu există" #: comdlg32.rc:36 msgid "File does not exist" -msgstr "Fişierul nu există" +msgstr "Fișierul nu există" #: comdlg32.rc:41 msgid "Up One Level" @@ -3793,7 +3793,7 @@ msgstr "" #: winerror.mc:331 msgid "File exists.\n" -msgstr "Fişierul există deja.\n" +msgstr "Fișierul există deja.\n" #: winerror.mc:336 msgid "Cannot create.\n" @@ -4516,7 +4516,7 @@ msgstr "" #: winerror.mc:1176 #, fuzzy msgid "Service does not exist.\n" -msgstr "Fişierul nu există.\n" +msgstr "Fișierul nu există.\n" #: winerror.mc:1181 msgid "Service cannot accept control message.\n" @@ -5121,7 +5121,7 @@ msgstr "" #: winerror.mc:1876 #, fuzzy msgid "The site does not exist.\n" -msgstr "Fişierul nu există.\n" +msgstr "Fișierul nu există.\n" #: winerror.mc:1881 #, fuzzy @@ -7498,11 +7498,11 @@ msgstr "Controlul fluxului" #: serialui.rc:34 msgid "Data Bits" -msgstr "Biţi de date" +msgstr "Biți de date" #: serialui.rc:36 msgid "Stop Bits" -msgstr "Biţi de stop" +msgstr "Biți de stop" #: setupapi.rc:36 msgid "Copying Files..." @@ -13782,7 +13782,7 @@ msgstr "Felicitări!" #: winemine.rc:76 msgid "Please enter your name" -msgstr "Scrieţi-vă numele" +msgstr "Scrieți-vă numele" #: winemine.rc:84 msgid "Custom Game"

1 0

Alexandre Julliard : rpcrt4: Add ref counting to RPC connections, and grab a reference while processing an RPC packet.
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: d2ca9f4b02079f669d44411c5e981fe6bf87dbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ca9f4b02079f669d44411c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 16:19:32 2012 +0100 rpcrt4: Add ref counting to RPC connections, and grab a reference while processing an RPC packet. --- dlls/rpcrt4/rpc_assoc.c | 6 +++--- dlls/rpcrt4/rpc_binding.c | 2 +- dlls/rpcrt4/rpc_binding.h | 4 +++- dlls/rpcrt4/rpc_message.c | 2 +- dlls/rpcrt4/rpc_server.c | 7 ++++--- dlls/rpcrt4/rpc_transport.c | 17 +++++++++++++---- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index bcaa1c2..8cf2947 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -203,7 +203,7 @@ ULONG RpcAssoc_Release(RpcAssoc *assoc) LIST_FOR_EACH_ENTRY_SAFE(Connection, cursor2, &assoc->free_connection_pool, RpcConnection, conn_pool_entry) { list_remove(&Connection->conn_pool_entry); - RPCRT4_DestroyConnection(Connection); + RPCRT4_ReleaseConnection(Connection); } LIST_FOR_EACH_ENTRY_SAFE(context_handle, context_handle_cursor, &assoc->context_handle_list, RpcContextHandle, entry) @@ -410,14 +410,14 @@ RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, status = RPCRT4_OpenClientConnection(NewConnection); if (status != RPC_S_OK) { - RPCRT4_DestroyConnection(NewConnection); + RPCRT4_ReleaseConnection(NewConnection); return status; } status = RpcAssoc_BindConnection(assoc, NewConnection, InterfaceId, TransferSyntax); if (status != RPC_S_OK) { - RPCRT4_DestroyConnection(NewConnection); + RPCRT4_ReleaseConnection(NewConnection); return status; } diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 685b569..11956e3 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -298,7 +298,7 @@ RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) /* don't destroy a connection that is cached in the binding */ if (Binding->FromConn == Connection) return RPC_S_OK; - return RPCRT4_DestroyConnection(Connection); + return RPCRT4_ReleaseConnection(Connection); } else { RpcAssoc_ReleaseIdleConnection(Binding->Assoc, Connection); diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 7d49074..21c962d 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -61,6 +61,7 @@ struct connection_ops; typedef struct _RpcConnection { + LONG ref; BOOL server; LPSTR NetworkAddr; LPSTR Endpoint; @@ -153,7 +154,8 @@ ULONG RpcQualityOfService_Release(RpcQualityOfService *qos) DECLSPEC_HIDDEN; BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQualityOfService *qos2) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS) DECLSPEC_HIDDEN; -RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; +RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) DECLSPEC_HIDDEN; +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 1d18627..189f6c4 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1875,7 +1875,7 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) fail: RPCRT4_FreeHeader(hdr); - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); pMsg->ReservedForRuntime = NULL; return status; } diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 9121280..6fd1a7b 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -539,6 +539,7 @@ static DWORD CALLBACK RPCRT4_worker_thread(LPVOID the_arg) RpcPacket *pkt = the_arg; RPCRT4_process_packet(pkt->conn, pkt->hdr, pkt->msg, pkt->auth_data, pkt->auth_length); + RPCRT4_ReleaseConnection(pkt->conn); HeapFree(GetProcessHeap(), 0, pkt); return 0; } @@ -585,7 +586,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) HeapFree(GetProcessHeap(), 0, auth_data); goto exit; } - packet->conn = conn; + packet->conn = RPCRT4_GrabConnection( conn ); packet->hdr = hdr; packet->msg = msg; packet->auth_data = auth_data; @@ -621,7 +622,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) } } exit: - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); return 0; } @@ -631,7 +632,7 @@ void RPCRT4_new_client(RpcConnection* conn) if (!thread) { DWORD err = GetLastError(); ERR("failed to create thread, error=%08x\n", err); - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); } /* we could set conn->thread, but then we'd have to make the io_thread wait * for that, otherwise the thread might finish, destroy the connection, and diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6568683..f873f71 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1374,7 +1374,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret < 0) { WARN("listen failed: %s\n", strerror(errno)); - RPCRT4_DestroyConnection(&tcpc->common); + RPCRT4_ReleaseConnection(&tcpc->common); status = RPC_S_OUT_OF_RESOURCES; continue; } @@ -1387,7 +1387,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret < 0) { WARN("couldn't make socket non-blocking, error %d\n", ret); - RPCRT4_DestroyConnection(&tcpc->common); + RPCRT4_ReleaseConnection(&tcpc->common); status = RPC_S_OUT_OF_RESOURCES; continue; } @@ -2946,6 +2946,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, } NewConnection = ops->alloc(); + NewConnection->ref = 1; NewConnection->Next = NULL; NewConnection->server_binding = NULL; NewConnection->server = server; @@ -2991,9 +2992,17 @@ static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnecti return err; } -RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection) +RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) { - TRACE("connection: %p\n", Connection); + InterlockedIncrement( &conn->ref ); + return conn; +} + +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) +{ + if (InterlockedDecrement( &Connection->ref ) > 0) return RPC_S_OK; + + TRACE("destroying connection %p\n", Connection); RPCRT4_CloseConnection(Connection); RPCRT4_strfree(Connection->Endpoint);

1 0

Charles Davis : ntdll: Zero reserved fields of the request structure in DVD_ReadDescriptor().
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: 454467dc932b6a541daec3e6d4f5547652e9d03b URL: http://source.winehq.org/git/wine.git/?a=commit;h=454467dc932b6a541daec3e6d… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Feb 13 17:06:36 2012 -0700 ntdll: Zero reserved fields of the request structure in DVD_ReadDescriptor(). --- dlls/ntdll/cdrom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 1cd511c..1d1aa63 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2640,6 +2640,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, } nt_desc; nt_desc.layer = layer; + RtlZeroMemory(&dvdrs, sizeof(dvdrs)); dvdrs.address = (uint32_t)(structure->BlockByteOffset.QuadPart>>11); dvdrs.grantID = (uint8_t)structure->SessionId; dvdrs.layer = structure->LayerNumber;

1 0

Johan Gill : advapi32: CryptCreateHash actually sets ERROR_INVALID_PARAMETER if the CSP handle is 0 .
by Alexandre Julliard Feb. 14, 2012

Feb. 14, 2012

Module: wine Branch: master Commit: 16dc83578a97eb68c739d8ee8fb7611b3b4fe3b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dc83578a97eb68c739d8ee8… Author: Johan Gill <johan.gill(a)gmail.com> Date: Tue Feb 14 12:15:04 2012 +0100 advapi32: CryptCreateHash actually sets ERROR_INVALID_PARAMETER if the CSP handle is 0. --- dlls/advapi32/crypt.c | 7 +------ dlls/advapi32/tests/crypt.c | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 31260a8..5f44728 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -720,12 +720,7 @@ BOOL WINAPI CryptCreateHash (HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, TRACE("(0x%lx, 0x%x, 0x%lx, %08x, %p)\n", hProv, Algid, hKey, dwFlags, phHash); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!phHash || prov->dwMagic != MAGIC_CRYPTPROV || + if (!prov || !phHash || prov->dwMagic != MAGIC_CRYPTPROV || (key && key->dwMagic != MAGIC_CRYPTKEY)) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index dae7263..7abf90b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -238,6 +238,9 @@ static void test_incorrect_api_usage(void) if (!result) return; pCryptDestroyHash(hHash); + result = pCryptCreateHash(0, CALG_SHA, 0, 0, &hHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = pCryptGenKey(0, CALG_RC4, 0, &hKey); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError());

1 0