February 2007 - Wine-commits

Aric Stewart : gdi32: Select correct replacement from ttc file.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 76ed11e180bcd97b4b77cdb017d895cdcfc7abb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ed11e180bcd97b4b77cdb01… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 26 14:25:27 2007 +0900 gdi32: Select correct replacement from ttc file. Some font files, especially Asian ttc files, can have several different families in the same file. So just using the file is not unique enough for identifying a replacement family. --- dlls/gdi32/freetype.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 73cc0f0..abcc0e6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -934,7 +934,7 @@ static WCHAR *get_familyname(FT_Face ft_face) #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 -static BOOL AddFontFileToList(const char *file, char *fake_family, DWORD flags) +static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR *target_family, DWORD flags) { FT_Face ft_face; TT_OS2 *pOS2; @@ -963,7 +963,7 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, DWORD flags) for(cursor = mac_list; *cursor; cursor++) { had_one = TRUE; - AddFontFileToList(*cursor, NULL, flags); + AddFontFileToList(*cursor, NULL, NULL, flags); HeapFree(GetProcessHeap(), 0, *cursor); } HeapFree(GetProcessHeap(), 0, mac_list); @@ -1010,6 +1010,19 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, DWORD flags) return FALSE; } + if (target_family) + { + localised_family = get_familyname(ft_face); + if (lstrcmpW(localised_family,target_family)!=0) + { + TRACE("Skipping Index %i: Incorrect Family name for replacement\n",(INT)face_index); + HeapFree(GetProcessHeap(), 0, localised_family); + num_faces = ft_face->num_faces; + continue; + } + HeapFree(GetProcessHeap(), 0, localised_family); + } + if(!family_name) family_name = ft_face->family_name; @@ -1259,7 +1272,7 @@ static void LoadReplaceList(void) 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 */ - AddFontFileToList(face->file, familyA, ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + AddFontFileToList(face->file, familyA, family->FamilyName, ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); } break; } @@ -1438,7 +1451,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) if(S_ISDIR(statbuf.st_mode)) ReadFontDir(path, external_fonts); else - AddFontFileToList(path, NULL, external_fonts ? ADDFONT_EXTERNAL_FONT : 0); + AddFontFileToList(path, NULL, NULL, external_fonts ? ADDFONT_EXTERNAL_FONT : 0); } closedir(dir); return TRUE; @@ -1506,7 +1519,7 @@ LOAD_FUNCPTR(FcPatternGetString); if(len < 4) continue; ext = &file[ len - 3 ]; if(strcasecmp(ext, "pfa") && strcasecmp(ext, "pfb")) - AddFontFileToList(file, NULL, ADDFONT_EXTERNAL_FONT); + AddFontFileToList(file, NULL, NULL, ADDFONT_EXTERNAL_FONT); } pFcFontSetDestroy(fontset); pFcObjectSetDestroy(os); @@ -1537,7 +1550,7 @@ static BOOL load_font_from_data_dir(LPCWSTR file) WideCharToMultiByte(CP_UNIXCP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL); - ret = AddFontFileToList(unix_name, NULL, ADDFONT_FORCE_BITMAP); + ret = AddFontFileToList(unix_name, NULL, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unix_name); } return ret; @@ -1563,7 +1576,7 @@ static void load_system_fonts(void) sprintfW(pathW, fmtW, windowsdir, data); if((unixname = wine_get_unix_file_name(pathW))) { - added = AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); + added = AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } if (!added) @@ -1697,7 +1710,7 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) if((unixname = wine_get_unix_file_name(file))) { - AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); + AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } } @@ -2020,7 +2033,7 @@ BOOL WineEngInit(void) { if((unixname = wine_get_unix_file_name((LPWSTR)data))) { - AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); + AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } } @@ -2033,7 +2046,7 @@ BOOL WineEngInit(void) sprintfW(pathW, fmtW, windowsdir, data); if((unixname = wine_get_unix_file_name(pathW))) { - added = AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); + added = AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } if (!added)

1 0

Alexander Nicolaysen Sørnes : wordpad: Set default font to 'Times New Roman', like native does.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: b603927c312a5b43f680533f6e66a662d93f1298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b603927c312a5b43f680533f6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Feb 26 18:32:11 2007 +0100 wordpad: Set default font to 'Times New Roman', like native does. --- programs/wordpad/wordpad.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0d45cb7..dccbfef 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -253,6 +253,21 @@ static void HandleCommandLine(LPWSTR cmdline) MessageBox(hMainWnd, "Printing not implemented", "WordPad", MB_OK); } +static void DoDefaultFont() +{ + static const WCHAR szFaceName[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; + CHARFORMAT2W fmt; + + ZeroMemory(&fmt, sizeof(fmt)); + + fmt.cbSize = sizeof(fmt); + fmt.dwMask = CFM_FACE; + + lstrcpyW(fmt.szFaceName, szFaceName); + + SendMessage(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); +} + static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) { HWND hToolBarWnd, hReBarWnd; @@ -332,6 +347,8 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) SetFocus(hEditorWnd); SendMessage(hEditorWnd, EM_SETEVENTMASK, 0, ENM_SELCHANGE); + DoDefaultFont(); + DoLoadStrings(); return 0;

1 0

Aric Stewart : gdi32: Allow for loading of multibyte font name replacements .
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: bc07aff1a543ceadf54c73b19f7ca3e960302d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc07aff1a543ceadf54c73b19… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 26 13:12:30 2007 +0900 gdi32: Allow for loading of multibyte font name replacements. Change a number of A function to W functions in LoadReplaceList to allow for replacements of fonts with multibyte family names. --- dlls/gdi32/freetype.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bb58646..73cc0f0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1224,43 +1224,42 @@ static void LoadReplaceList(void) { HKEY hkey; DWORD valuelen, datalen, i = 0, type, dlen, vlen; - LPSTR value; + LPWSTR value; LPVOID data; Family *family; Face *face; struct list *family_elem_ptr, *face_elem_ptr; - WCHAR old_nameW[200]; + CHAR familyA[400]; /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts\\Replacements", &hkey) == ERROR_SUCCESS) { - RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &valuelen, &datalen, NULL, NULL); valuelen++; /* returned value doesn't include room for '\0' */ - value = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(CHAR)); + value = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); data = HeapAlloc(GetProcessHeap(), 0, datalen); dlen = datalen; vlen = valuelen; - while(RegEnumValueA(hkey, i++, value, &vlen, NULL, &type, data, + while(RegEnumValueW(hkey, i++, value, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) { - TRACE("Got %s=%s\n", debugstr_a(value), debugstr_a(data)); + TRACE("Got %s=%s\n", debugstr_w(value), debugstr_w(data)); /* "NewName"="Oldname" */ - if(!MultiByteToWideChar(CP_ACP, 0, data, -1, old_nameW, sizeof(old_nameW)/sizeof(WCHAR))) - break; + WideCharToMultiByte(CP_ACP, 0, value, -1, familyA, sizeof(familyA), NULL, NULL); /* 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, old_nameW)) { + family = LIST_ENTRY(family_elem_ptr, Family, entry); + if(!strcmpiW(family->FamilyName, 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), value); + debugstr_w(face->StyleName), familyA); /* Now add a new entry with the new family name */ - AddFontFileToList(face->file, value, ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + AddFontFileToList(face->file, familyA, ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); } break; }

1 0

Alex Arazi : comctl32: More status bar tests.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 489db09da82b96df839cb24742ced5b46faa3170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489db09da82b96df839cb2474… Author: Alex Arazi <alexarazi(a)gmail.com> Date: Sun Feb 25 20:43:26 2007 -0800 comctl32: More status bar tests. --- dlls/comctl32/tests/status.c | 142 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 128 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index bfb0e7f..4e643c1 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -1,6 +1,7 @@ /* Unit test suite for status control. * * Copyright 2007 Google (Lei Zhang) + * Copyright 2007 Alex Arazi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,10 +21,11 @@ #include <assert.h> #include <windows.h> #include <commctrl.h> -#include <stdio.h> #include "wine/test.h" +#define expect(expected,got) ok (expected == got,"Expected %d, got %d\n",expected,got); + static HINSTANCE hinst; static HWND create_status_control(DWORD style, DWORD exstyle) @@ -31,7 +33,7 @@ static HWND create_status_control(DWORD style, DWORD exstyle) HWND hWndStatus; /* make the control */ - hWndStatus = CreateWindowEx(0, STATUSCLASSNAME, NULL, style, + hWndStatus = CreateWindowEx(exstyle, STATUSCLASSNAME, NULL, style, /* placement */ 0, 0, 300, 20, /* parent, etc */ @@ -45,29 +47,141 @@ static void test_status_control(void) HWND hWndStatus; int r; int nParts[] = {50, 150, -1}; + int checkParts[] = {0, 0, 0}; + int borders[] = {0, 0, 0}; RECT rc; + CHAR charArray[20]; + HICON hIcon; + + hWndStatus = create_status_control(WS_VISIBLE, 0); - hWndStatus = create_status_control(0, 0); + /* Divide into parts and set text */ r = SendMessage(hWndStatus, SB_SETPARTS, 3, (long)nParts); - ok(r == TRUE, "Expected TRUE, got %d\n", r); + expect(TRUE,r); r = SendMessage(hWndStatus, SB_SETTEXT, 0, (LPARAM)"First"); - ok(r == TRUE, "Expected TRUE, got %d\n", r); + expect(TRUE,r); r = SendMessage(hWndStatus, SB_SETTEXT, 1, (LPARAM)"Second"); - ok(r == TRUE, "Expected TRUE, got %d\n", r); + expect(TRUE,r); r = SendMessage(hWndStatus, SB_SETTEXT, 2, (LPARAM)"Third"); - ok(r == TRUE, "Expected TRUE, got %d\n", r); + expect(TRUE,r); + /* Get RECT Information */ r = SendMessage(hWndStatus, SB_GETRECT, 0, (LPARAM)&rc); + expect(TRUE,r); + expect(2,rc.top); + /* The rc.bottom test is system dependent + expect(22,rc.bottom); */ + expect(0,rc.left); + expect(50,rc.right); + r = SendMessage(hWndStatus, SB_GETRECT, -1, (LPARAM)&rc); + expect(FALSE,r); + r = SendMessage(hWndStatus, SB_GETRECT, 3, (LPARAM)&rc); + expect(FALSE,r); + /* Get text length and text */ + r = SendMessage(hWndStatus, SB_GETTEXTLENGTH, 2, 0); + expect(5,LOWORD(r)); + expect(0,HIWORD(r)); + r = SendMessage(hWndStatus, SB_GETTEXT, 2, (LPARAM) charArray); + ok(strcmp(charArray,"Third") == 0, "Expected Third, got %s\n", charArray); + expect(5,LOWORD(r)); + expect(0,HIWORD(r)); + + /* Get parts and borders */ + r = SendMessage(hWndStatus, SB_GETPARTS, 3, (long)checkParts); + ok(r == 3, "Expected 3, got %d\n", r); + expect(50,checkParts[0]); + expect(150,checkParts[1]); + expect(-1,checkParts[2]); + r = SendMessage(hWndStatus, SB_GETBORDERS, 0, (long)borders); ok(r == TRUE, "Expected TRUE, got %d\n", r); - ok(rc.top == 2, "Expected 2, got %d\n", rc.top); - ok(rc.bottom == 21, "Expected 21, got %d\n", rc.bottom); - ok(rc.left == 0, "Expected 0, got %d\n", rc.left); - ok(rc.right == 50, "Expected 50, got %d\n", rc.right); + expect(0,borders[0]); + expect(2,borders[1]); + expect(2,borders[2]); + + /* Test resetting text with different characters */ + r = SendMessage(hWndStatus, SB_SETTEXT, 0, (LPARAM)"First(a)Again"); + expect(TRUE,r); + r = SendMessage(hWndStatus, SB_SETTEXT, 1, (LPARAM)"InvalidChars\\7\7"); + expect(TRUE,r); + r = SendMessage(hWndStatus, SB_SETTEXT, 2, (LPARAM)"InvalidChars\\n\n"); + expect(TRUE,r); + /* Get text again */ + r = SendMessage(hWndStatus, SB_GETTEXT, 0, (LPARAM) charArray); + ok(strcmp(charArray,"First(a)Again") == 0, "Expected First(a)Again, got %s\n", charArray); + expect(11,LOWORD(r)); + expect(0,HIWORD(r)); + r = SendMessage(hWndStatus, SB_GETTEXT, 1, (LPARAM) charArray); + todo_wine + { + ok(strcmp(charArray,"InvalidChars\\7 ") == 0, "Expected InvalidChars\\7 , got %s\n", charArray); + } + expect(15,LOWORD(r)); + expect(0,HIWORD(r)); + r = SendMessage(hWndStatus, SB_GETTEXT, 2, (LPARAM) charArray); + todo_wine + { + ok(strcmp(charArray,"InvalidChars\\n ") == 0, "Expected InvalidChars\\n , got %s\n", charArray); + } + expect(15,LOWORD(r)); + expect(0,HIWORD(r)); + + /* Set background color */ + r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0)); + expect(CLR_DEFAULT,r); + r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT); + expect(RGB(255,0,0),r); + + /* Add an icon to the status bar */ + hIcon = LoadIcon(NULL, IDI_QUESTION); + r = SendMessage(hWndStatus, SB_SETICON, 1, (LPARAM) NULL); + ok(r != 0, "Expected non-zero, got %d\n", r); + r = SendMessage(hWndStatus, SB_SETICON, 1, (LPARAM) hIcon); + ok(r != 0, "Expected non-zero, got %d\n", r); + r = SendMessage(hWndStatus, SB_SETICON, 1, (LPARAM) NULL); + ok(r != 0, "Expected non-zero, got %d\n", r); + + /* Set the Unicode format */ + r = SendMessage(hWndStatus, SB_SETUNICODEFORMAT, FALSE, 0); + r = SendMessage(hWndStatus, SB_GETUNICODEFORMAT, 0, 0); + expect(FALSE,r); + r = SendMessage(hWndStatus, SB_SETUNICODEFORMAT, TRUE, 0); + expect(FALSE,r); + r = SendMessage(hWndStatus, SB_GETUNICODEFORMAT, 0, 0); + expect(TRUE,r); + + /* Reset number of parts */ + r = SendMessage(hWndStatus, SB_SETPARTS, 2, (long)nParts); + expect(TRUE,r); + + /* Set the minimum height and get rectangle information again */ + SendMessage(hWndStatus, SB_SETMINHEIGHT, 50, (LPARAM) 0); + r = SendMessage(hWndStatus, WM_SIZE, 0, (LPARAM) 0); + expect(0,r); + r = SendMessage(hWndStatus, SB_GETRECT, 0, (LPARAM)&rc); + expect(TRUE,r); + expect(2,rc.top); + /* The rc.bottom test is system dependent + expect(22,rc.bottom); */ + expect(0,rc.left); + expect(50,rc.right); r = SendMessage(hWndStatus, SB_GETRECT, -1, (LPARAM)&rc); - ok(r == FALSE, "Expected FALSE, got %d\n", r); - r = SendMessage(hWndStatus, SB_GETRECT, 5, (LPARAM)&rc); - ok(r == FALSE, "Expected FALSE, got %d\n", r); + expect(FALSE,r); + r = SendMessage(hWndStatus, SB_GETRECT, 3, (LPARAM)&rc); + expect(FALSE,r); + + /* Set the ToolTip text */ + todo_wine + { + SendMessage(hWndStatus, SB_SETTIPTEXT, 0,(LPARAM) "Tooltip Text"); + SendMessage(hWndStatus, SB_GETTIPTEXT, MAKEWPARAM (0, 20),(LPARAM) charArray); + ok(strcmp(charArray,"Tooltip Text") == 0, "Expected Tooltip Text, got %s\n", charArray); + } + + /* Make simple */ + SendMessage(hWndStatus, SB_SIMPLE, TRUE, 0); + r = SendMessage(hWndStatus, SB_ISSIMPLE, 0, 0); + expect(TRUE,r); DestroyWindow(hWndStatus); }

1 0

Alexandre Julliard : gdi32: Make DC creation fail if we cannot allocate the visible region.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 2d4735ae67ee85471b99355635441cd67e80f8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4735ae67ee85471b9935563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 26 19:01:30 2007 +0100 gdi32: Make DC creation fail if we cannot allocate the visible region. --- dlls/gdi32/dc.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5010bdf..0e9f5eb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -626,14 +626,11 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, ERR( "no driver found for %s\n", debugstr_w(buf) ); return 0; } - if (!(dc = DC_AllocDC( funcs, DC_MAGIC ))) - { - DRIVER_release_driver( funcs ); - return 0; - } + if (!(dc = DC_AllocDC( funcs, DC_MAGIC ))) goto error; hdc = dc->hSelf; dc->hBitmap = GetStockObject( DEFAULT_BITMAP ); + if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); @@ -642,17 +639,21 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, !dc->funcs->pCreateDC( hdc, &dc->physDev, buf, device, output, initData )) { WARN("creation aborted by device\n" ); - GDI_FreeObject( dc->hSelf, dc ); - DRIVER_release_driver( funcs ); - return 0; + goto error; } - dc->hVisRgn = CreateRectRgn( 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), - GetDeviceCaps( hdc, DESKTOPVERTRES ) ); + SetRectRgn( dc->hVisRgn, 0, 0, + GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES ) ); DC_InitDC( dc ); GDI_ReleaseObj( hdc ); return hdc; + +error: + if (dc && dc->hVisRgn) DeleteObject( dc->hVisRgn ); + if (dc) GDI_FreeObject( dc->hSelf, dc ); + DRIVER_release_driver( funcs ); + return 0; } @@ -741,15 +742,12 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) if (!funcs) return 0; - if (!(dc = DC_AllocDC( funcs, MEMORY_DC_MAGIC ))) - { - DRIVER_release_driver( funcs ); - return 0; - } + if (!(dc = DC_AllocDC( funcs, MEMORY_DC_MAGIC ))) goto error; TRACE("(%p): returning %p\n", hdc, dc->hSelf ); dc->hBitmap = GetStockObject( DEFAULT_BITMAP ); + if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */ /* Copy the driver-specific physical device info into * the new DC. The driver may use this read-only info @@ -760,16 +758,18 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) !dc->funcs->pCreateDC( dc->hSelf, &dc->physDev, NULL, NULL, NULL, NULL )) { WARN("creation aborted by device\n"); - GDI_FreeObject( dc->hSelf, dc ); - DRIVER_release_driver( funcs ); - return 0; + goto error; } - dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ); /* default bitmap is 1x1 */ - DC_InitDC( dc ); GDI_ReleaseObj( dc->hSelf ); return dc->hSelf; + +error: + if (dc && dc->hVisRgn) DeleteObject( dc->hVisRgn ); + if (dc) GDI_FreeObject( dc->hSelf, dc ); + DRIVER_release_driver( funcs ); + return 0; }

1 0

Huw Davies : msxml3: Register schema cache classes.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: cdac075e41dc99f887ab9eeb932f09cae5b05791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdac075e41dc99f887ab9eeb9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 23 12:30:41 2007 +0000 msxml3: Register schema cache classes. --- dlls/msxml3/regsvr.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 5648e1e..24514df 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -583,6 +583,22 @@ static struct regsvr_coclass const coclass_list[] = { "Both", "Msxml" }, + { &CLSID_XMLSchemaCache, + "XML Schema Cache", + NULL, + "msxml3.dll", + "Both", + "Msxml2.XMLSchemaCache", + "3.0" + }, + { &CLSID_XMLSchemaCache30, + "XML Schema Cache 3.0", + NULL, + "msxml3.dll", + "Both", + "Msxml2.XMLSchemaCache", + "3.0" + }, { NULL } /* list terminator */ }; @@ -662,6 +678,17 @@ static struct progid const progid_list[] = { &CLSID_XMLDocument, NULL }, + { "Msxml2.XMLSchemaCache", + "XML Schema Cache", + &CLSID_XMLSchemaCache, + "Msxml2.XMLSchemaCache.3.0" + }, + { "Msxml2.XMLSchemaCache.3.0", + "XML Schema Cache 3.0", + &CLSID_XMLSchemaCache30, + NULL + }, + { NULL } /* list terminator */ };

1 0

Francois Gouget : ddraw/tests: There is no unnamed union in D3DLIGHT7.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: dbbef46e5af72d0a3b4e59091ee2a8bbc729046a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbef46e5af72d0a3b4e59091… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 26 16:46:19 2007 +0100 ddraw/tests: There is no unnamed union in D3DLIGHT7. --- dlls/ddraw/tests/d3d.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 1125875..7237ff3 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -248,33 +248,33 @@ static void LightTest(void) U3(light.dcvDiffuse).b = 1.f; U3(light.dvDirection).z = 1.f; - U3(light.dvAttenuation0) = -1.0 / 0.0; /* -INFINITY */ + light.dvAttenuation0 = -1.0 / 0.0; /* -INFINITY */ rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==DDERR_INVALIDPARAMS, "SetLight returned: %x\n", rc); - U3(light.dvAttenuation0) = -1.0; + light.dvAttenuation0 = -1.0; rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==DDERR_INVALIDPARAMS, "SetLight returned: %x\n", rc); - U3(light.dvAttenuation0) = 0.0; + light.dvAttenuation0 = 0.0; rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc); - U3(light.dvAttenuation0) = 1.0; + light.dvAttenuation0 = 1.0; rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc); - U3(light.dvAttenuation0) = 1.0 / 0.0; /* +INFINITY */ + light.dvAttenuation0 = 1.0 / 0.0; /* +INFINITY */ rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc); - U3(light.dvAttenuation0) = 0.0 / 0.0; /* NaN */ + light.dvAttenuation0 = 0.0 / 0.0; /* NaN */ rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc); /* Directional light ignores attenuation */ light.dltType = D3DLIGHT_DIRECTIONAL; - U3(light.dvAttenuation0) = -1.0; + light.dvAttenuation0 = -1.0; rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc); }

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: a98b9d76c684d5c9d9d83e967d6c879cbd46b876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98b9d76c684d5c9d9d83e967… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 26 16:46:46 2007 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index c2c2ed3..58a701d 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -126,7 +126,7 @@ static DWORD getPixelColor(IDirect3DDevice7 *device, UINT x, UINT y) */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; ddsd.dwWidth = 640; ddsd.dwHeight = 480; @@ -141,7 +141,7 @@ static DWORD getPixelColor(IDirect3DDevice7 *device, UINT x, UINT y) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); hr = IDirectDrawSurface_BltFast(surf, 0, 0, Surface, NULL, 0); ok(hr == DD_OK, "IDirectDrawSurface7_BltFast returned %08x\n", hr);

1 0

Huw Davies : msxml3: Convert the domdoc object to use the IXMLDOMDocument2 interface.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 9ceb5a3ea717ae711a91c033cbacd74ed79d01d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ceb5a3ea717ae711a91c033c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 26 12:49:12 2007 +0000 msxml3: Convert the domdoc object to use the IXMLDOMDocument2 interface. --- dlls/msxml3/domdoc.c | 331 ++++++++++++++++++++++++++------------------ dlls/msxml3/tests/domdoc.c | 30 ++++- 2 files changed, 223 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ceb5a3ea717ae711a91c…

1 0

Maarten Lankhorst : winealsa: Remove usage of uninitialised variable.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: e9da4016c1b0409e02597b0b6bf49f42d4ddda57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9da4016c1b0409e02597b0b6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Feb 26 16:19:43 2007 +0100 winealsa: Remove usage of uninitialised variable. --- dlls/winealsa.drv/dsoutput.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 5eca299..ef9d9b2 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -143,9 +143,6 @@ static DWORD CALLBACK DBSB_MMAPLoop(LPVOID data) TRACE_(waveloop)("0x%8p\n", data); TRACE("0x%8p, framelength: %lu, area: %8p\n", data, pdbi->mmap_buflen_frames, pdbi->mmap_areas); - if (areas != pdbi->mmap_areas || areas->addr != pdbi->mmap_areas->addr) - FIXME("Can't access sound driver's buffer directly.\n"); - do { enum win_wm_message msg; DWORD param;

1 0