June 2009 - Wine-commits - list.winehq.org

André Hentschel : appwiz.cpl: Add German translation.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: c170567e04f6e9ee68cb34d4cc038cf156f3c768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c170567e04f6e9ee68cb34d4c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 31 16:56:03 2009 +0200 appwiz.cpl: Add German translation. --- dlls/appwiz.cpl/De.rc | 81 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc new file mode 100644 index 0000000..3030cd1 --- /dev/null +++ b/dlls/appwiz.cpl/De.rc @@ -0,0 +1,81 @@ +/* +* Add/Remove Programs German resources +* +* Copyright 2009 André Hentschel +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "Software" + IDS_CPL_DESC, "Erlaubt ihnen neue Software hinzuzufügen, oder vorhandene zu entfernen." + IDS_TAB1_TITLE, "Anwendungen" + + IDS_UNINSTALL_FAILED, "Der Uninstaller konnte nicht gestartet werden, '%s'. Möchten Sie den Uninstall-Eintrag für dieses Programm aus der Registrierung entfernen?" + IDS_NOT_SPECIFIED, "Nicht angegeben" + + IDS_COLUMN_NAME, "Name" + IDS_COLUMN_PUBLISHER, "Herausgeber" + IDS_COLUMN_VERSION, "Version" +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Software" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Um ein Programm von Diskette, CD-ROM oder Festplatte zu installieren, klicken Sie Installieren.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Installieren...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Folgende Programme können automatisch entfernt werden. Um ein Programm zu entfernen oder um installierte Komponenten zu ändern, wählen Sie es aus der Liste aus und klicken Sie auf Ändern/Entfernen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "Än&dern/Entfernen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 230, 198, 80, 14 + CONTROL "&Informationen...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 198, 64, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Support Information" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Verwenden Sie folgende Informationen um technischen Support für %s zu erhalten:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Herausgeber:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Version:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Supportinformationen:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 94, 8 + CONTROL "Supportrufnummer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Produkt Updates:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Kommentare:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} + +#pragma code_page(default) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 7764463..f59cb97 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -25,6 +25,7 @@ #include "res.h" +#include "De.rc" #include "En.rc" #include "Fr.rc" #include "Ja.rc"

1 0

Andrew Eikum : gdiplus: Stubs for GdipAddPathString and GdipAddPathStringI.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 8d6ee56119d79529530532c070577d1d4de8f2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6ee56119d79529530532c07… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun May 31 14:59:23 2009 -0500 gdiplus: Stubs for GdipAddPathString and GdipAddPathStringI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphicspath.c | 12 ++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index dff3cf3..b6d9377 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -29,8 +29,8 @@ @ stdcall GdipAddPathRectangleI(ptr long long long long) @ stdcall GdipAddPathRectangles(ptr ptr long) @ stdcall GdipAddPathRectanglesI(ptr ptr long) -@ stub GdipAddPathString -@ stub GdipAddPathStringI +@ stdcall GdipAddPathString(ptr wstr long ptr long long ptr ptr) +@ stdcall GdipAddPathStringI(ptr wstr long ptr long long ptr ptr) @ stdcall GdipAlloc(long) @ stdcall GdipBeginContainer2(ptr ptr) @ stub GdipBeginContainer diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8ffe531..1375cc3 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -831,6 +831,18 @@ GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath *path, GDIPCONST GpPoint *points, return status; } +GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat* format) +{ + FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipAddPathStringI(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST Rect* layoutRect, GDIPCONST GpStringFormat* format) +{ + FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) { TRACE("(%p, %p)\n", path, clone); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a7ee536..c2c96c5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -281,6 +281,8 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath*,GDIPCONST GpRectF*,INT); GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath*,GDIPCONST GpRect*,INT); +GpStatus WINGDIPAPI GdipAddPathString(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST RectF*,GDIPCONST GpStringFormat*); +GpStatus WINGDIPAPI GdipAddPathStringI(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST Rect*,GDIPCONST GpStringFormat*); GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath*); GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*);

1 0

Andrew Eikum : gdiplus: Stubs for GdipBeginContainer and GdipBeginContainerI.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 309150660965735cdab1f03354764119509a714a URL: http://source.winehq.org/git/wine.git/?a=commit;h=309150660965735cdab1f0335… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun May 31 15:00:03 2009 -0500 gdiplus: Stubs for GdipBeginContainer and GdipBeginContainerI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 12 ++++++++++++ include/gdiplusflat.h | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b6d9377..e156db4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -33,8 +33,8 @@ @ stdcall GdipAddPathStringI(ptr wstr long ptr long long ptr ptr) @ stdcall GdipAlloc(long) @ stdcall GdipBeginContainer2(ptr ptr) -@ stub GdipBeginContainer -@ stub GdipBeginContainerI +@ stdcall GdipBeginContainer(ptr ptr ptr long ptr) +@ stdcall GdipBeginContainerI(ptr ptr ptr long ptr) @ stub GdipBitmapApplyEffect @ stub GdipBitmapConvertFormat @ stub GdipBitmapCreateApplyEffect diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1c128d4..adeea3c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3152,6 +3152,18 @@ GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, GraphicsContainer return Ok; } +GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics *graphics, GDIPCONST GpRectF *dstrect, GDIPCONST GpRectF *srcrect, GpUnit unit, GraphicsContainer *state) +{ + FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics *graphics, GDIPCONST GpRect *dstrect, GDIPCONST GpRect *srcrect, GpUnit unit, GraphicsContainer *state) +{ + FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) { FIXME("(%p, 0x%x)\n", graphics, state); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c2c96c5..28cea41 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -118,6 +118,9 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily *, INT, BOOL*); /* Graphics */ GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); +GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics*,GDIPCONST GpRectF*,GDIPCONST GpRectF*,GpUnit,GraphicsContainer*); +GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics*,GraphicsContainer*); +GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics*,GDIPCONST GpRect*,GDIPCONST GpRect*,GpUnit,GraphicsContainer*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**);

1 0

Nicolas Le Cam : winetest: Only call GetTempPath once.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 62ab6ab1c5847ac0f8765fa66c51d7df24bc82f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ab6ab1c5847ac0f8765fa66… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun May 31 13:33:17 2009 +0200 winetest: Only call GetTempPath once. --- programs/winetest/main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 69496bd..381328c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -658,9 +658,6 @@ run_tests (char *logname) if (logfile == INVALID_HANDLE_VALUE) report (R_FATAL, "Could not open logfile: %u", GetLastError()); - if (!GetTempPathA( MAX_PATH, tmppath )) - report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); - /* try stable path for ZoneAlarm */ strcpy( tempdir, tmppath ); strcat( tempdir, "wct" );

1 0

Nikolay Sivov : comctl32/listview: Some tests for LVM_EDITLABEL.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 5e53ddfc6f40cc17ffe9520b103dc6ad9e3e697d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e53ddfc6f40cc17ffe9520b1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 1 02:17:35 2009 +0400 comctl32/listview: Some tests for LVM_EDITLABEL. --- dlls/comctl32/tests/listview.c | 57 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 42b9df6..dd5fd86 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -230,6 +230,10 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP } add_message(sequences, PARENT_FULL_SEQ_INDEX, &msg); + /* always accept new item text */ + if (message == WM_NOTIFY && lParam && ((NMHDR*)lParam)->code == LVN_ENDLABELEDIT) + return TRUE; + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; @@ -2830,6 +2834,58 @@ static void test_getitemrect(void) DestroyWindow(hwnd); } +static void test_editbox(void) +{ + HWND hwnd, hwndedit; + LVITEMA item; + DWORD r; + static CHAR testitemA[] = "testitem"; + static CHAR testitem1A[] = "testitem1"; + static CHAR buffer[10]; + + hwnd = create_listview_control(LVS_EDITLABELS); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_column(hwnd, 0); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_TEXT; + item.pszText = testitemA; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(0, r); + + /* setting focus is necessary */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + + /* modify initial string */ + r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem1A); + expect(TRUE, r); + /* return focus to listview */ + SetFocus(hwnd); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_TEXT; + item.pszText = buffer; + item.cchTextMax = 10; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + + ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + + /* creating label disabled when control isn't focused */ + SetFocus(0); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + todo_wine ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2878,6 +2934,7 @@ START_TEST(listview) test_getviewrect(); test_getitemposition(); test_columnscreation(); + test_editbox(); DestroyWindow(hwndparent); }

1 0

Eric Pouech : winhlp32: Correctly set the window' s title when no window information is present.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: d67df82636ac5897ba908193b76e6a0f33c9b716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67df82636ac5897ba908193b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 31 21:13:59 2009 +0200 winhlp32: Correctly set the window's title when no window information is present. --- programs/winhlp32/winhelp.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 027bf65..a0177ee 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -274,7 +274,15 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) { strcpy(mwi.type, "primary"); strcpy(mwi.name, "main"); - LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); + if (hlpfile->lpszTitle[0]) + { + char tmp[128]; + LoadString(Globals.hInstance, STID_WINE_HELP, tmp, sizeof(tmp)); + snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s", + hlpfile->lpszTitle, tmp, hlpfile->lpszPath); + } + else + LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; mwi.style = SW_SHOW; mwi.win_style = WS_OVERLAPPEDWINDOW;

1 0

Eric Pouech : winhlp32: Fix typo in color init.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: a105f924f4c82c4c0eb292b01eb69e850647bc91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a105f924f4c82c4c0eb292b01… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 31 21:14:17 2009 +0200 winhlp32: Fix typo in color init. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index a0177ee..1639c14 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -286,7 +286,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; mwi.style = SW_SHOW; mwi.win_style = WS_OVERLAPPEDWINDOW; - mwi.sr_color = mwi.sr_color = 0xFFFFFF; + mwi.sr_color = mwi.nsr_color = 0xFFFFFF; } return &mwi; }

1 0

Gerald Pfeifer : msxml3: Tweak two assertions.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 875f0c2470c862bba1d54ff9bf0b337989ded830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875f0c2470c862bba1d54ff9b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 31 23:51:44 2009 +0200 msxml3: Tweak two assertions. --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f33f6f8..19fa4c5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -369,8 +369,8 @@ static HRESULT WINAPI xmlnode_get_nodeType( TRACE("%p %p\n", This, type); - assert( NODE_ELEMENT == XML_ELEMENT_NODE ); - assert( NODE_NOTATION == XML_NOTATION_NODE ); + assert( (int)NODE_ELEMENT == (int)XML_ELEMENT_NODE ); + assert( (int)NODE_NOTATION == (int)XML_NOTATION_NODE ); *type = This->node->type;

1 0

Alexandre Julliard : d3d9/tests: Skip CheckDeviceMultiSampleType test if not available.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 2449eea0fdb4559a199743db2d747977bab6b687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2449eea0fdb4559a199743db2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 14:07:39 2009 +0200 d3d9/tests: Skip CheckDeviceMultiSampleType test if not available. --- dlls/d3d9/tests/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f1d3595..5610a71 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -172,7 +172,12 @@ static void test_checkdevicemultisampletype(void) hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONE, &qualityLevels); - ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "CheckDeviceMultiSampleType failed with (%08x)\n", hr); + if(hr == D3DERR_NOTAVAILABLE) + { + skip("IDirect3D9_CheckDeviceMultiSampleType not available\n"); + goto cleanup; + } ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, FALSE,

1 0

Detlef Riekenberg : mlang: Return HRESULT from lcid_to_rfc1766 helper.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: e84ae0e720b65606c6c8d962d0c572c50b732d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84ae0e720b65606c6c8d962d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 22:58:54 2009 +0200 mlang: Return HRESULT from lcid_to_rfc1766 helper. --- dlls/mlang/mlang.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9cd9a87..bac4e48 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1135,7 +1135,7 @@ HRESULT WINAPI IsConvertINetStringAvailable( return S_FALSE; } -static inline INT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) +static inline HRESULT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) { INT n = GetLocaleInfoA( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); if (n) @@ -1143,12 +1143,12 @@ static inline INT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) rfc1766[n - 1] = '-'; n += GetLocaleInfoA( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); LCMapStringA( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); - return n; + return S_OK; } - return 0; + return E_FAIL; } -static inline INT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) +static inline HRESULT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) { INT n = GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); INT save = n; @@ -1159,9 +1159,9 @@ static inline INT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) if (n == save) rfc1766[n - 1] = '\0'; LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); - return n; + return S_OK; } - return 0; + return E_FAIL; } HRESULT WINAPI LcidToRfc1766A( @@ -1171,10 +1171,7 @@ HRESULT WINAPI LcidToRfc1766A( { TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); - if (lcid_to_rfc1766A( lcid, pszRfc1766, nChar )) - return S_OK; - - return S_FALSE; + return lcid_to_rfc1766A(lcid, pszRfc1766, nChar); } HRESULT WINAPI LcidToRfc1766W( @@ -1184,10 +1181,7 @@ HRESULT WINAPI LcidToRfc1766W( { TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); - if (lcid_to_rfc1766W( lcid, pszRfc1766, nChar )) - return S_OK; - - return S_FALSE; + return lcid_to_rfc1766W(lcid, pszRfc1766, nChar); } static HRESULT lcid_from_rfc1766(IEnumRfc1766 *iface, LCID *lcid, LPCWSTR rfc1766) @@ -2239,7 +2233,7 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid( TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - if (lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) + if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) { *pbstrRfc1766 = SysAllocString( buf ); return S_OK; @@ -2794,7 +2788,7 @@ static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766FromLcid( TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - if (lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) + if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) { *pbstrRfc1766 = SysAllocString( buf ); return S_OK;

1 0