March 2008 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Fixed some tests.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: d3682dd33f1299923deb344fa6a9ae2c930498a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3682dd33f1299923deb344fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 2 19:53:13 2008 +0100 wininet: Fixed some tests. --- dlls/wininet/tests/internet.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index d3adf91..15495db 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -289,7 +289,8 @@ static void test_null(void) sz = 0; r = InternetGetCookieW(NULL, NULL, NULL, &sz); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, + "wrong error %u\n", GetLastError()); ok( r == FALSE, "return wrong\n"); r = InternetGetCookieW(szServer, NULL, NULL, &sz); @@ -315,7 +316,7 @@ static void test_null(void) ok( r == TRUE, "return wrong\n"); /* sz == lstrlenW(buffer) only in XP SP1 */ - ok( sz == 1 + lstrlenW(buffer), "sz wrong\n"); + ok( sz == 1 + lstrlenW(buffer) || sz == lstrlenW(buffer), "sz wrong %d\n", sz); /* before XP SP2, buffer is "server; server" */ ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer), "cookie data wrong\n");

1 0

Dmitry Timoshkov : fonts: Add capital cyrillic glyphs to tahoma.sfd.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: abbcbd8c010b7f843d194318b0dce9a9e8ad1c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbcbd8c010b7f843d194318b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Mar 2 23:49:41 2008 +0800 fonts: Add capital cyrillic glyphs to tahoma.sfd. --- fonts/tahoma.sfd | 1247 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 1219 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abbcbd8c010b7f843d194…

1 0

Mikołaj Zalewski : wrc: Convert standard control classes names into ids also for UTF-8 resource files .
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: fee6076a2bbecab84219de413695137eaf8fe9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee6076a2bbecab84219de413… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Mar 1 23:13:39 2008 +0100 wrc: Convert standard control classes names into ids also for UTF-8 resource files. --- tools/wrc/parser.y | 71 ++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 50 insertions(+), 21 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 94ce44c..28d3998 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2079,34 +2079,63 @@ byebye: return ctrl; } +static int get_class_idW(const WCHAR *cc) +{ + static const WCHAR szBUTTON[] = {'B','U','T','T','O','N',0}; + static const WCHAR szCOMBOBOX[] = {'C','O','M','B','O','B','O','X',0}; + static const WCHAR szLISTBOX[] = {'L','I','S','T','B','O','X',0}; + static const WCHAR szEDIT[] = {'E','D','I','T',0}; + static const WCHAR szSTATIC[] = {'S','T','A','T','I','C',0}; + static const WCHAR szSCROLLBAR[] = {'S','C','R','O','L','L','B','A','R',0}; + + if(!strcmpiW(szBUTTON, cc)) + return CT_BUTTON; + if(!strcmpiW(szCOMBOBOX, cc)) + return CT_COMBOBOX; + if(!strcmpiW(szLISTBOX, cc)) + return CT_LISTBOX; + if(!strcmpiW(szEDIT, cc)) + return CT_EDIT; + if(!strcmpiW(szSTATIC, cc)) + return CT_STATIC; + if(!strcmpiW(szSCROLLBAR, cc)) + return CT_SCROLLBAR; + + return -1; +} + +static int get_class_idA(const char *cc) +{ + if(!strcasecmp("BUTTON", cc)) + return CT_BUTTON; + if(!strcasecmp("COMBOBOX", cc)) + return CT_COMBOBOX; + if(!strcasecmp("LISTBOX", cc)) + return CT_LISTBOX; + if(!strcasecmp("EDIT", cc)) + return CT_EDIT; + if(!strcasecmp("STATIC", cc)) + return CT_STATIC; + if(!strcasecmp("SCROLLBAR", cc)) + return CT_SCROLLBAR; + + return -1; +} + + static name_id_t *convert_ctlclass(name_id_t *cls) { - char *cc = NULL; int iclass; if(cls->type == name_ord) return cls; assert(cls->type == name_str); - if(cls->type == str_unicode) - { - yyerror("Don't yet support unicode class comparison"); - } - else - cc = cls->name.s_name->str.cstr; - - if(!strcasecmp("BUTTON", cc)) - iclass = CT_BUTTON; - else if(!strcasecmp("COMBOBOX", cc)) - iclass = CT_COMBOBOX; - else if(!strcasecmp("LISTBOX", cc)) - iclass = CT_LISTBOX; - else if(!strcasecmp("EDIT", cc)) - iclass = CT_EDIT; - else if(!strcasecmp("STATIC", cc)) - iclass = CT_STATIC; - else if(!strcasecmp("SCROLLBAR", cc)) - iclass = CT_SCROLLBAR; - else + if(cls->name.s_name->type == str_unicode) + iclass = get_class_idW(cls->name.s_name->str.wstr); + else + iclass = get_class_idA(cls->name.s_name->str.cstr); + + if (iclass == -1) return cls; /* No default, return user controlclass */ free(cls->name.s_name->str.cstr);

1 0

Dmitry Timoshkov : fonts: Change encoding of tahoma.sfd to unicode.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 2b51976094fa862b6ee7d3dd239ed75e692b186e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b51976094fa862b6ee7d3dd2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Mar 2 23:48:19 2008 +0800 fonts: Change encoding of tahoma.sfd to unicode. --- fonts/tahoma.sfd | 818 +++++++++++++++++++++++++++--------------------------- 1 files changed, 409 insertions(+), 409 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b51976094fa862b6ee7d…

1 0

Stefan Dösinger : d3d9: Fix an ok line.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: aedb8873c0bdd2f4d2ff76e648a493b0c98788bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedb8873c0bdd2f4d2ff76e64… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 22 13:05:21 2008 +0100 d3d9: Fix an ok line. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index eb82a63..6e44581 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -744,7 +744,7 @@ static void test_reset(void) for(i = 0; i < IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); i++) { ZeroMemory( &d3ddm2, sizeof(d3ddm2) ); hr = IDirect3D9_EnumAdapterModes(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); - ok(hr == D3D_OK, "IDirect3D9Impl_EnumAdapterModes returned %#x\n", hr); + ok(hr == D3D_OK, "IDirect3D9_EnumAdapterModes returned %#x\n", hr); if(d3ddm2.Width == 800 && d3ddm2.Height == 600) { support_800x600 = TRUE;

1 0

Stefan Dösinger : include: Declare IDirect3D9Ex and IDirect3DDevice9Ex.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 90a654aede803578ec0f9d3419c800f671ede26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a654aede803578ec0f9d341… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 23 17:57:53 2008 +0100 include: Declare IDirect3D9Ex and IDirect3DDevice9Ex. --- include/d3d9.h | 515 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/d3d9types.h | 44 +++++ 2 files changed, 559 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90a654aede803578ec0f9…

1 0

Stefan Dösinger : wined3d: Catch NOP palette changes.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: dd997c1de6c79caac298b1a8f6c97ed451f494dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd997c1de6c79caac298b1a8f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 25 10:59:53 2008 +0100 wined3d: Catch NOP palette changes. --- dlls/wined3d/surface_base.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index da0ccbf..babb49f 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -197,6 +197,11 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD IWineD3DPaletteImpl *PalImpl = (IWineD3DPaletteImpl *) Pal; TRACE("(%p)->(%p)\n", This, Pal); + if(This->palette == PalImpl) { + TRACE("Nop palette change\n"); + return WINED3D_OK; + } + if(This->palette != NULL) if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) This->palette->Flags &= ~WINEDDPCAPS_PRIMARYSURFACE;

1 0

Marcus Meissner : shlwapi: Handle buffer overflow on A->W converter.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 088a33729ae8285c92c278dad91803c8ab19fa08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088a33729ae8285c92c278dad… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 1 23:12:26 2008 +0100 shlwapi: Handle buffer overflow on A->W converter. --- dlls/shlwapi/path.c | 7 ++++++- dlls/shlwapi/tests/path.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index b2005c1..ae9c991 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -2344,7 +2344,12 @@ BOOL WINAPI PathCanonicalizeA(LPSTR lpszBuf, LPCSTR lpszPath) { WCHAR szPath[MAX_PATH]; WCHAR szBuff[MAX_PATH]; - MultiByteToWideChar(CP_ACP,0,lpszPath,-1,szPath,MAX_PATH); + int ret = MultiByteToWideChar(CP_ACP,0,lpszPath,-1,szPath,MAX_PATH); + + if (!ret) { + WARN("Failed to convert string to widechar (too long?), LE %d.\n", GetLastError()); + return FALSE; + } bRet = PathCanonicalizeW(szBuff, szPath); WideCharToMultiByte(CP_ACP,0,szBuff,-1,lpszBuf,MAX_PATH,0,0); } diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 82112a5..b2d2a9e 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -908,9 +908,9 @@ static void test_PathCanonicalizeA(void) lstrcpy(dest, "test"); SetLastError(0xdeadbeef); res = PathCanonicalizeA(dest, too_long); + ok(!res, "Expected failure\n"); todo_wine { - ok(!res, "Expected failure\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); } ok(lstrlen(too_long) == LONG_LEN - 1, "Expected length LONG_LEN - 1, got %i\n", lstrlen(too_long));

1 0

Stefan Dösinger : wined3d: Subclass queries.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 071d4afb2b5bc34acfb3e24940fd72bfd931bda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=071d4afb2b5bc34acfb3e2494… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 28 21:02:58 2008 +0100 wined3d: Subclass queries. --- dlls/wined3d/device.c | 7 ++ dlls/wined3d/query.c | 129 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 90 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=071d4afb2b5bc34acfb3e…

1 0

Stefan Dösinger : wined3d: Give occlusion queries their own vtable.
by Alexandre Julliard 03 Mar '08

03 Mar '08

Module: wine Branch: master Commit: 32be503c627e43cadfcfc09b1670cd8775cbf048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32be503c627e43cadfcfc09b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 28 21:03:41 2008 +0100 wined3d: Give occlusion queries their own vtable. --- dlls/wined3d/device.c | 4 +- dlls/wined3d/query.c | 190 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 111 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32be503c627e43cadfcfc…

1 0