wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Jacek Caban : atl: Share atl_ax.c with atl100.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 383cacea8fa9ce2e0408292af4a6c917ac700465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383cacea8fa9ce2e0408292af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 19:02:48 2014 +0100 atl: Share atl_ax.c with atl100. --- dlls/atl/Makefile.in | 5 ++++- dlls/atl/atl.spec | 18 +++++++++--------- dlls/atl/atl_main.c | 48 ------------------------------------------------ dlls/atl100/atl_ax.c | 17 +++++++++++------ 4 files changed, 24 insertions(+), 64 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 8cc63bb..3fc9591 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -2,7 +2,10 @@ MODULE = atl.dll IMPORTLIB = atl IMPORTS = uuid atl80 atl100 oleaut32 ole32 user32 EXTRADEFS = -D_ATL_VER=_ATL_VER_30 +PARENTSRC = ../atl100 -C_SRCS = atl_main.c +C_SRCS = \ + atl_ax.c \ + atl_main.c IDL_SRCS = atl_classes.idl diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 4737580..2dca559 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -26,20 +26,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) 44 stdcall AtlModuleExtractCreateWndData(ptr) 45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 509d4bb..6288ff8 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -593,51 +593,3 @@ DWORD WINAPI AtlGetVersion(void *pReserved) TRACE("version %04x (%p)\n", _ATL_VER, pReserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) -{ - if ( wMsg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hWnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hWnd, ptr, len ); - AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hWnd, wMsg, wParam, lParam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index be52917..0a16010 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -87,7 +87,9 @@ BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; -#if _ATL_VER == _ATL_VER_80 +#if _ATL_VER <= _ATL_VER_30 +#define ATL_NAME_SUFFIX 0 +#elif _ATL_VER == _ATL_VER_80 #define ATL_NAME_SUFFIX '8','0',0 #elif _ATL_VER == _ATL_VER_90 #define ATL_NAME_SUFFIX '9','0',0 @@ -100,7 +102,6 @@ BOOL WINAPI AtlAxWinInit(void) #endif const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; - const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -108,7 +109,7 @@ BOOL WINAPI AtlAxWinInit(void) return FALSE; wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.style = CS_GLOBALCLASS | (_ATL_VER > _ATL_VER_30 ? CS_DBLCLKS : 0); wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = GetModuleHandleW( NULL ); @@ -123,9 +124,13 @@ BOOL WINAPI AtlAxWinInit(void) if ( !RegisterClassExW( &wcex ) ) return FALSE; - wcex.lpszClassName = AtlAxWinLicW; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; + if(_ATL_VER > _ATL_VER_30) { + const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; + + wcex.lpszClassName = AtlAxWinLicW; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + } return TRUE; }

1 0

Andrey Gusev : xinput1_4: Add version.rc file.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 29de4d987eac1bff4718d8a200e428359937ef62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29de4d987eac1bff4718d8a20… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 13 13:27:44 2014 +0200 xinput1_4: Add version.rc file. --- dlls/xinput1_4/Makefile.in | 2 ++ dlls/xinput1_4/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index 9e3754d..43d1812 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -2,3 +2,5 @@ MODULE = xinput1_4.dll C_SRCS = \ xinput1_4_main.c + +RC_SRCS = version.rc diff --git a/dlls/xinput1_4/version.rc b/dlls/xinput1_4/version.rc new file mode 100644 index 0000000..e100371 --- /dev/null +++ b/dlls/xinput1_4/version.rc @@ -0,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2014 Andrey Gusev + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput1_4.dll" +#define WINE_FILEVERSION 6,3,9600,16384 +#define WINE_FILEVERSION_STR "6.3.9600.16384" +#define WINE_PRODUCTVERSION 6,3,9600,16384 +#define WINE_PRODUCTVERSION_STR "6.3" + +#include "wine/wine_common_ver.rc"

1 0

Ștefan Fulea : fonts: Correct the bitmap parts of Romanian diacritical letters in Tahoma Bold.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 01ac10b33cfa2f4f860a72065b9f2a28cba2e24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ac10b33cfa2f4f860a72065… Author: Ștefan Fulea <stefan.fulea(a)mail.md> Date: Wed Feb 12 23:33:41 2014 +0200 fonts: Correct the bitmap parts of Romanian diacritical letters in Tahoma Bold. --- fonts/tahomabd.sfd | 246 +++++++++++++++++++++++++++++----------------------- fonts/tahomabd.ttf | Bin 136576 -> 136708 bytes 2 files changed, 138 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01ac10b33cfa2f4f860a7…

1 0

Ștefan Fulea : fonts: Add the missing Romanian diacritical letters to Tahoma Bold.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 95b7d9db55926ad12fa4e573bea8e51e85853c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b7d9db55926ad12fa4e573b… Author: Ștefan Fulea <stefan.fulea(a)mail.md> Date: Wed Feb 12 23:32:04 2014 +0200 fonts: Add the missing Romanian diacritical letters to Tahoma Bold. --- fonts/tahomabd.sfd | 165 +++++++++++++++++++++++++++++++++++++++++++++++++--- fonts/tahomabd.ttf | Bin 135636 -> 136576 bytes 2 files changed, 157 insertions(+), 8 deletions(-) diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index 71f372d..16b0ea5 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -125,7 +125,7 @@ ExpansionFactor 4 0.06 EndPrivate TeXData: 1 0 0 327680 163840 109226 571904 -1048576 109226 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 AnchorClass2: "Anchor-10" "'mark' Mark Positioning lookup 9 subtable" "Anchor-9" "'mark' Mark Positioning lookup 8 subtable" "Anchor-7" "'mark' Mark Positioning lookup 6 subtable" "Anchor-6" "'mark' Mark Positioning lookup 5 subtable" "Anchor-1" "'mkmk' Mark to Mark in Arabic lookup 1 subtable" "Anchor-0" "'mkmk' Mark to Mark in Arabic lookup 0 subtable" -BeginChars: 65677 970 +BeginChars: 65677 975 StartChar: .notdef Encoding: 65536 -1 0 @@ -19462,8 +19462,73 @@ Fore Refer: 840 -1 N 1 0 0 1 0 0 2 Refer: 561 -1 N 1 0 0 1 218 850 2 EndChar + +StartChar: uni0326 +Encoding: 806 806 970 +Width: 0 +VWidth: 0 +HStem: -411 276<447 524> +VStem: 361 308 +LayerCount: 2 +Fore +SplineSet +361 -411 m 1 + 447 -135 l 1 + 669 -135 l 1 + 524 -411 l 1 + 361 -411 l 1 +EndSplineSet +EndChar + +StartChar: Scommaaccent +Encoding: 536 536 971 +Width: 1297 +Flags: W +HStem: -410 276<449 526> -17 164<338.667 837.867> 1369 163<435.993 753.733> +VStem: 89 206<1023.33 1289.2> 363 308 886 211<181.933 591> +LayerCount: 2 +Fore +Refer: 970 806 S 1 0 0 1 1.99951 1 2 +Refer: 52 83 N 1 0 0 1 0 0 3 +EndChar + +StartChar: scommaaccent +Encoding: 537 537 972 +Width: 1054 +Flags: W +HStem: -410.056 276<374 451> -41 154<298.856 587.533> 981 154<342.2 643.267> +VStem: 76 178<740.8 952.933> 288 308 696 189<143.6 347.133> +LayerCount: 2 +Fore +Refer: 970 806 S 1 0 0 1 -73 0.944481 2 +Refer: 84 115 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni021A +Encoding: 538 538 973 +Width: 1254 +Flags: W +HStem: -398 276<482.5 559.5> 0 21<498 701> 1318 171<3 498 701 1198> +VStem: 396.5 308 498 203<0 1318> +LayerCount: 2 +Fore +Refer: 970 806 S 1 0 0 1 35.5 13 2 +Refer: 53 84 N 1 0 0 1 0 0 3 +EndChar + +StartChar: uni021B +Encoding: 539 539 974 +Width: 851 +Flags: W +HStem: -398 276<300.5 377.5> 0 154<426 719> 977 143<20 155 340 719> +VStem: 155 185<274.336 977 1120 1438> 214.5 308 +LayerCount: 2 +Fore +Refer: 970 806 S 1 0 0 1 -146.5 13 2 +Refer: 85 116 N 1 0 0 1 0 0 3 +EndChar EndChars -BitmapFont: 9 971 7 2 1 +BitmapFont: 9 975 7 2 1 BDFChar: 0 65536 9 1 7 0 6 rdo`RJqEt% BDFChar: 1 32 3 0 0 0 0 @@ -20326,8 +20391,20 @@ BDFChar: 429 1210 6 0 4 0 6 ^qfHlf\"gV BDFChar: 430 1211 6 0 4 0 5 ^qfHlf[p0( +BDFChar: 971 536 6 0 0 0 0 +z +BDFChar: 972 537 5 0 0 0 0 +z +BDFChar: 973 538 7 0 0 0 0 +z +BDFChar: 974 539 4 0 0 0 0 +z +BDFRefChar: 971 52 0 0 N +BDFRefChar: 972 84 0 0 N +BDFRefChar: 973 53 0 0 N +BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 10 971 8 2 1 +BitmapFont: 10 975 8 2 1 BDFChar: 0 65536 10 1 8 0 7 s+,`PJUrCP BDFChar: 1 32 3 0 0 0 0 @@ -21190,8 +21267,20 @@ BDFChar: 429 1210 6 0 4 0 6 ^qfHlf\"gV BDFChar: 430 1211 6 0 4 0 5 ^qfHlf[p0( +BDFChar: 971 536 6 0 0 0 0 +z +BDFChar: 972 537 5 0 0 0 0 +z +BDFChar: 973 538 7 0 0 0 0 +z +BDFChar: 974 539 4 0 0 0 0 +z +BDFRefChar: 971 52 0 0 N +BDFRefChar: 972 84 0 0 N +BDFRefChar: 973 53 0 0 N +BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 11 971 9 2 1 FontForge +BitmapFont: 11 975 9 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--11-80-96-96-P-62-ISO10646-1" FONTBOUNDINGBOX 1 "15 11 0 -2" @@ -22089,8 +22178,20 @@ BDFChar: 429 1210 7 0 5 0 7 ^qdb\bfn;T BDFChar: 430 1211 7 0 5 0 6 ^qdb\bfn92 +BDFChar: 971 536 7 0 0 0 0 +z +BDFChar: 972 537 6 0 0 0 0 +z +BDFChar: 973 538 7 0 0 0 0 +z +BDFChar: 974 539 5 0 0 0 0 +z +BDFRefChar: 971 52 0 0 N +BDFRefChar: 972 84 0 0 N +BDFRefChar: 973 53 0 0 N +BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 12 971 10 2 1 FontForge +BitmapFont: 12 975 10 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--12-90-96-96-P-70-ISO10646-1" FONTBOUNDINGBOX 1 "16 12 0 -2" @@ -22786,8 +22887,20 @@ BDFChar: 429 1210 8 0 6 0 8 ^qdb`k/PE\`W,u= BDFChar: 430 1211 8 0 6 0 7 ^qdb`k/PE\ +BDFChar: 971 536 8 0 0 0 0 +z +BDFChar: 972 537 6 0 0 0 0 +z +BDFChar: 973 538 9 0 0 0 0 +z +BDFChar: 974 539 6 0 0 0 0 +z +BDFRefChar: 971 52 0 0 N +BDFRefChar: 972 84 0 0 N +BDFRefChar: 973 53 0 0 N +BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 13 971 10 3 1 FontForge +BitmapFont: 13 975 10 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--13-100-96-96-P-73-ISO10646-1" FONTBOUNDINGBOX 1 "15 13 0 -3" @@ -23479,8 +23592,20 @@ BDFChar: 429 1210 7 -1 6 0 8 ^qeaf_o'C0_Z0Z: BDFChar: 430 1211 7 -1 5 0 6 ^qeaf`l?!u +BDFChar: 971 536 8 0 0 0 0 +z +BDFChar: 972 537 6 0 0 0 0 +z +BDFChar: 973 538 8 0 0 0 0 +z +BDFChar: 974 539 4 0 0 0 0 +z +BDFRefChar: 971 52 0 0 N +BDFRefChar: 972 84 0 0 N +BDFRefChar: 973 53 0 0 N +BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 15 971 12 3 1 FontForge +BitmapFont: 15 975 12 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--15-110-96-96-P-85-ISO10646-1" FONTBOUNDINGBOX 1 "19 15 0 -3" @@ -24172,8 +24297,20 @@ BDFChar: 429 1210 8 0 7 0 10 J:N0#]Y]5NJUr@P BDFChar: 430 1211 8 0 6 0 8 J:N0__LdAkJcGcN +BDFChar: 971 536 8 0 0 0 0 +z +BDFChar: 972 537 7 0 0 0 0 +z +BDFChar: 973 538 10 0 0 0 0 +z +BDFChar: 974 539 5 0 0 0 0 +z +BDFRefChar: 971 52 0 0 N +BDFRefChar: 972 84 0 0 N +BDFRefChar: 973 53 0 0 N +BDFRefChar: 974 85 0 0 N EndBitmapFont -BitmapFont: 16 971 13 3 1 FontForge +BitmapFont: 16 975 13 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--16-120-96-96-P-93-ISO10646-1" FONTBOUNDINGBOX 1 "21 16 0 -3" @@ -24865,5 +25002,17 @@ BDFChar: 429 1210 9 0 8 0 11 J,k*"J,k*"^&YtLJ:N0#J:N0#J:N0# BDFChar: 430 1211 9 0 7 0 9 J:N0__L[8hJUme$ +BDFChar: 971 536 9 0 0 0 0 +z +BDFChar: 972 537 7 0 0 0 0 +z +BDFChar: 973 538 10 0 0 0 0 +z +BDFChar: 974 539 5 0 0 0 0 +z +BDFRefChar: 971 52 0 0 N +BDFRefChar: 972 84 0 0 N +BDFRefChar: 973 53 0 0 N +BDFRefChar: 974 85 0 0 N EndBitmapFont EndSplineFont diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index db67032..05cafd6 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Ken Thomases : d3d9/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: a6f00eb2b9fc3fbf14433930ed6e3555842f7c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6f00eb2b9fc3fbf14433930e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 12 13:27:32 2014 -0600 d3d9/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8. --- dlls/d3d9/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6877a0b..4f94c3b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2347,7 +2347,7 @@ static void test_display_formats(void) hr = IDirect3D9_CheckDeviceType(d3d9, D3DADAPTER_DEFAULT, device_type, formats[display].format, formats[backbuffer].format, windowed); - ok(SUCCEEDED(hr) == should_pass, + ok(SUCCEEDED(hr) == should_pass || broken(SUCCEEDED(hr) && !has_modes) /* Win8 64-bit */, "Got unexpected hr %#x for %s / %s, windowed %#x, should_pass %#x.\n", hr, formats[display].name, formats[backbuffer].name, windowed, should_pass); }

1 0

Ken Thomases : d3d8/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: bdb9a9e4f0f5394dffbdb40f113dacf8cca98c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb9a9e4f0f5394dffbdb40f1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 12 13:27:02 2014 -0600 d3d8/tests: Ignore broken CheckDeviceType() behavior on 64-bit Windows 8. --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b93acf4..78f6773 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1053,7 +1053,7 @@ static void test_display_formats(void) hr = IDirect3D8_CheckDeviceType(d3d8, D3DADAPTER_DEFAULT, device_type, formats[display].format, formats[backbuffer].format, windowed); - ok(SUCCEEDED(hr) == should_pass, + ok(SUCCEEDED(hr) == should_pass || broken(SUCCEEDED(hr) && !has_modes) /* Win8 64-bit */, "Got unexpected hr %#x for %s / %s, windowed %#x, should_pass %#x.\n", hr, formats[display].name, formats[backbuffer].name, windowed, should_pass); }

1 0

Andrey Gusev : odbccu32: Correct filename string.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: e41a5422b0b06c5bb25f7b11635a6b540a86f43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41a5422b0b06c5bb25f7b116… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 13 16:05:46 2014 +0200 odbccu32: Correct filename string. --- dlls/odbccu32/version.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccu32/version.rc b/dlls/odbccu32/version.rc index bc1e6f2..f951271 100644 --- a/dlls/odbccu32/version.rc +++ b/dlls/odbccu32/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine ODBC Cursor Library" -#define WINE_FILENAME_STR "odbcu32.dll" +#define WINE_FILENAME_STR "odbccu32.dll" #define WINE_FILEVERSION 6,1,7601,17632 #define WINE_FILEVERSION_STR "6.1.7601.17632" #define WINE_PRODUCTVERSION 6,1,7601,17632

1 0

Frédéric Delanoy : msi: Fix typo in a field name.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: f21225a41b3c2e507b90efc8cff3a3951109b0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21225a41b3c2e507b90efc8c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 13 14:25:39 2014 +0100 msi: Fix typo in a field name. --- dlls/msi/action.c | 6 +++--- dlls/msi/msipriv.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 73aae35..07322fe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1887,7 +1887,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) component->anyAbsent = 1; break; case INSTALLSTATE_ADVERTISED: - component->hasAdvertiseFeature = 1; + component->hasAdvertisedFeature = 1; break; case INSTALLSTATE_SOURCE: component->hasSourceFeature = 1; @@ -1897,7 +1897,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) break; case INSTALLSTATE_DEFAULT: if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) - component->hasAdvertiseFeature = 1; + component->hasAdvertisedFeature = 1; else if (feature->Attributes & msidbFeatureAttributesFavorSource) component->hasSourceFeature = 1; else @@ -1942,7 +1942,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) component->ActionRequest = INSTALLSTATE_SOURCE; continue; } - if (component->hasAdvertiseFeature) + if (component->hasAdvertisedFeature) { component->Action = INSTALLSTATE_ADVERTISED; component->ActionRequest = INSTALLSTATE_ADVERTISED; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3780d48..c585b43 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -487,7 +487,7 @@ typedef struct tagMSICOMPONENT int num_clients; unsigned int anyAbsent:1; - unsigned int hasAdvertiseFeature:1; + unsigned int hasAdvertisedFeature:1; unsigned int hasLocalFeature:1; unsigned int hasSourceFeature:1; } MSICOMPONENT;

1 0

Jacek Caban : urlmon: Added IsInternetESCEnabledLocal implementation.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 8f07fbcd534ff38b00359cffb1651019d06db492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f07fbcd534ff38b00359cffb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 13 13:49:58 2014 +0100 urlmon: Added IsInternetESCEnabledLocal implementation. --- dlls/urlmon/sec_mgr.c | 35 +++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 36 insertions(+) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index eaad546..dc57c88 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -49,6 +49,12 @@ static const WCHAR wszZonesKey[] = {'S','o','f','t','w','a','r','e','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', 'Z','o','n','e','s','\\',0}; +static const WCHAR zone_map_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'Z','o','n','e','M','a','p',0}; static const WCHAR wszZoneMapDomainsKey[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', @@ -2067,3 +2073,32 @@ HRESULT WINAPI CompareSecurityIds(BYTE *secid1, DWORD size1, BYTE *secid2, DWORD FIXME("(%p %d %p %d %x)\n", secid1, size1, secid2, size2, reserved); return E_NOTIMPL; } + +/******************************************************************** + * IsInternetESCEnabledLocal (URLMON.108) + * + * Undocumented, returns if IE is running in Enhanced Security Configuration. + */ +BOOL WINAPI IsInternetESCEnabledLocal(void) +{ + static BOOL esc_initialized, esc_enabled; + + TRACE("()\n"); + + if(!esc_initialized) { + DWORD type, size, val; + HKEY zone_map; + + static const WCHAR iehardenW[] = {'I','E','H','a','r','d','e','n',0}; + + if(RegOpenKeyExW(HKEY_CURRENT_USER, zone_map_keyW, 0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if(RegQueryValueExW(zone_map, iehardenW, NULL, &type, (BYTE*)&val, &size) == ERROR_SUCCESS) + esc_enabled = type == REG_DWORD && val != 0; + RegCloseKey(zone_map); + } + esc_initialized = TRUE; + } + + return esc_enabled; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index e66fff7..96ba40a 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -95,6 +95,7 @@ @ stub WriteHitLogging @ stub ZonesReInit +108 stdcall @() IsInternetESCEnabledLocal 111 stdcall @(wstr) IsProtectedModeURL 328 stdcall @(ptr ptr) propsys.VariantCompare 329 stdcall @(ptr ptr) propsys.VariantToGUID

1 0

Nikolay Sivov : advapi32/tests: Accept another error code returned on some WinXP systems.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 9756550c25e29745dba4c9ca81deba7916fd8854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9756550c25e29745dba4c9ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 13 16:45:13 2014 +0400 advapi32/tests: Accept another error code returned on some WinXP systems. --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 907c73b..e2e9cd5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2679,8 +2679,8 @@ static void test_impersonation_level(void) /* can't perform access check when opening object against an anonymous impersonation token */ todo_wine { error = RegOpenKeyExA(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hkey); - ok(error == ERROR_INVALID_HANDLE || error == ERROR_CANT_OPEN_ANONYMOUS, - "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE or ERROR_CANT_OPEN_ANONYMOUS instead of %d\n", error); + ok(error == ERROR_INVALID_HANDLE || error == ERROR_CANT_OPEN_ANONYMOUS || error == ERROR_BAD_IMPERSONATION_LEVEL, + "RegOpenKeyEx failed with %d\n", error); } RevertToSelf();

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014