February 2011 - Wine-Commits

Akihiro Sagawa : hhctrl.ocx: Use DEFAULT_GUI_FONT to show non-ansi characters properly.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: e7efd148a8f0af12bbe21e5ebf8b01efd2f925b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7efd148a8f0af12bbe21e5eb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 26 20:31:26 2011 +0900 hhctrl.ocx: Use DEFAULT_GUI_FONT to show non-ansi characters properly. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 31060fe..4c6196e 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1509,7 +1509,7 @@ static void HH_CreateFont(HHInfo *pHHInfo) { LOGFONTW lf; - GetObjectW(GetStockObject(ANSI_VAR_FONT), sizeof(LOGFONTW), &lf); + GetObjectW(GetStockObject(DEFAULT_GUI_FONT), sizeof(LOGFONTW), &lf); lf.lfWeight = FW_NORMAL; lf.lfItalic = FALSE; lf.lfUnderline = FALSE;

1 0

Wolfram Sang : user32: Check bitmap info before it is used.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: c67f075d67a6d8de19dae570022265fc0f89ef52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67f075d67a6d8de19dae5700… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Thu Feb 24 22:12:09 2011 +0100 user32: Check bitmap info before it is used. --- dlls/user32/cursoricon.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2c9aeef..cd7d3ed 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2198,6 +2198,14 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } + bm_type = DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, + &bpp_dummy, &compr_dummy); + if (bm_type == -1) + { + WARN("Invalid bitmap format!\n"); + goto end; + } + size = bitmap_info_size(info, DIB_RGB_COLORS); fix_info = HeapAlloc(GetProcessHeap(), 0, size); scaled_info = HeapAlloc(GetProcessHeap(), 0, size); @@ -2209,13 +2217,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, DIB_FixColorsToLoadflags(fix_info, loadflags, pix); memcpy(scaled_info, fix_info, size); - bm_type = DIB_GetBitmapInfo( &fix_info->bmiHeader, &width, &height, - &bpp_dummy, &compr_dummy); - if (bm_type == -1) - { - WARN("Invalid bitmap format!\n"); - goto end; - } if(desiredx != 0) new_width = desiredx;

1 0

Wolfram Sang : user32: Make DIB_GetBitmapInfo checks stricter.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: ce5763b88c23e3c3452036c748edffb3f1e7bb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5763b88c23e3c3452036c74… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Thu Feb 24 22:12:08 2011 +0100 user32: Make DIB_GetBitmapInfo checks stricter. --- dlls/user32/cursoricon.c | 6 ++++-- dlls/user32/tests/cursoricon.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d007c6e..2c9aeef 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -372,7 +372,9 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *compr = 0; return 0; } - else if (header->biSize >= sizeof(BITMAPINFOHEADER)) + else if (header->biSize == sizeof(BITMAPINFOHEADER) || + header->biSize == sizeof(BITMAPV4HEADER) || + header->biSize == sizeof(BITMAPV5HEADER)) { *width = header->biWidth; *height = header->biHeight; @@ -380,7 +382,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *compr = header->biCompression; return 1; } - ERR("(%d): unknown/wrong size for header\n", header->biSize ); + WARN("unknown/wrong size (%u) for header\n", header->biSize); return -1; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 454606a..da748b6 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -765,6 +765,24 @@ static unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +static const DWORD biSize_tests[] = { + 0, + sizeof(BITMAPCOREHEADER) - 1, + sizeof(BITMAPCOREHEADER) + 1, + sizeof(BITMAPINFOHEADER) - 1, + sizeof(BITMAPINFOHEADER) + 1, + sizeof(BITMAPV4HEADER) - 1, + sizeof(BITMAPV4HEADER) + 1, + sizeof(BITMAPV5HEADER) - 1, + sizeof(BITMAPV5HEADER) + 1, + (sizeof(BITMAPCOREHEADER) + sizeof(BITMAPINFOHEADER)) / 2, + (sizeof(BITMAPV4HEADER) + sizeof(BITMAPV5HEADER)) / 2, + 0xdeadbeef, + 0xffffffff +}; + +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) { BITMAP bm; @@ -856,6 +874,7 @@ static void test_LoadImage(void) CURSORICONFILEDIRENTRY *icon_entry; BITMAPINFOHEADER *icon_header, *bitmap_header; ICONINFO icon_info; + int i; #define ICON_WIDTH 32 #define ICON_HEIGHT 32 @@ -992,8 +1011,16 @@ static void test_LoadImage(void) bitmap_header->biWidth = 65536; test_LoadImageFile("BMP (too wide)", bmpimage, sizeof(bmpimage), "bmp", 0); bitmap_header->biWidth = 1; + + for (i = 0; i < ARRAY_SIZE(biSize_tests); i++) { + bitmap_header->biSize = biSize_tests[i]; + test_LoadImageFile("BMP (broken biSize)", bmpimage, sizeof(bmpimage), "bmp", 0); + } + bitmap_header->biSize = sizeof(BITMAPINFOHEADER); } +#undef ARRAY_SIZE + static void test_CreateIconFromResource(void) { HANDLE handle;

1 0

Akihiro Sagawa : credui: Add Japanese translation.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: 0ba05ee3f03ab16a29a0434bc85333b2e5430899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba05ee3f03ab16a29a0434bc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 26 20:31:20 2011 +0900 credui: Add Japanese translation. --- dlls/credui/Makefile.in | 1 + dlls/credui/credui_Ja.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index d300b3b..9d0ffb9 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ credui_He.rc \ credui_Hu.rc \ credui_It.rc \ + credui_Ja.rc \ credui_Ko.rc \ credui_Lt.rc \ credui_Nl.rc \ diff --git a/dlls/credui/credui_Ja.rc b/dlls/credui/credui_Ja.rc new file mode 100644 index 0000000..8f47ef5 --- /dev/null +++ b/dlls/credui/credui_Ja.rc @@ -0,0 +1,46 @@ +/* + * Japanese language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2011 Akihiro Sagawa + * + * 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 + */ + +#include "credui_resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "ユーザ名(&U):",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "パスワード(&P):",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "パスワードを保存する(&R)",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "キャンセル",IDCANCEL,156,128,50,14 +END

1 0

Austin English : lz32/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: ca10161c5c6c0b00b00de6b16a42005524639eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca10161c5c6c0b00b00de6b16… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:35:19 2011 -0800 lz32/tests: Remove win9x hacks. --- dlls/lz32/tests/lzexpand_main.c | 144 ++++++++++++--------------------------- 1 files changed, 44 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca10161c5c6c0b00b00de…

1 0

Wolfram Sang : user32/tests: Modify proper fields instead of magic offsets.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: 25923d2f16c56bb6840f92b2c4b0cc2b2ef927aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=25923d2f16c56bb6840f92b2c… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Thu Feb 24 22:12:07 2011 +0100 user32/tests: Modify proper fields instead of magic offsets. --- dlls/user32/tests/cursoricon.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index cba5704..454606a 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -854,7 +854,7 @@ static void test_LoadImage(void) DWORD error, bytes_written; CURSORICONFILEDIR *icon_data; CURSORICONFILEDIRENTRY *icon_entry; - BITMAPINFOHEADER *icon_header; + BITMAPINFOHEADER *icon_header, *bitmap_header; ICONINFO icon_info; #define ICON_WIDTH 32 @@ -981,13 +981,17 @@ static void test_LoadImage(void) test_LoadImageFile("GIF (2x2 pixel)", gif4pixel, sizeof(gif4pixel), "gif", 0); test_LoadImageFile("JPG", jpgimage, sizeof(jpgimage), "jpg", 0); test_LoadImageFile("PNG", pngimage, sizeof(pngimage), "png", 0); + /* Check failure for broken BMP images */ - bmpimage[0x14]++; /* biHeight > 65535 */ + bitmap_header = (BITMAPINFOHEADER *)(bmpimage + sizeof(BITMAPFILEHEADER)); + + bitmap_header->biHeight = 65536; test_LoadImageFile("BMP (too high)", bmpimage, sizeof(bmpimage), "bmp", 0); - bmpimage[0x14]--; - bmpimage[0x18]++; /* biWidth > 65535 */ + bitmap_header->biHeight = 1; + + bitmap_header->biWidth = 65536; test_LoadImageFile("BMP (too wide)", bmpimage, sizeof(bmpimage), "bmp", 0); - bmpimage[0x18]--; + bitmap_header->biWidth = 1; } static void test_CreateIconFromResource(void)

1 0

Austin English : crypt32/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: 3ac1db562acce7b8b361d9f5b9f3f561c5d08ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac1db562acce7b8b361d9f5b… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 15:23:52 2011 -0800 crypt32/tests: Remove win9x hacks. --- dlls/crypt32/tests/store.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 67ebe11..6d3c54f 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -960,7 +960,7 @@ static void testRegStore(void) certCount++; } while (context != NULL); ok(certCount == 1 || - broken(certCount == 2), /* win9x */ + broken(certCount == 2) /* NT4 */ , "Expected 1 certificates, got %d\n", certCount); /* Try again with the correct hash... */ @@ -1161,10 +1161,7 @@ static void testSystemStore(void) /* Check opening a bogus store */ store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, BogusW); - ok((!store || - broken(store != 0)) && /* win9x */ - GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ok(!store, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, BogusW); ok(store != 0, "CertOpenStore failed: %08x\n", GetLastError()); @@ -1764,7 +1761,7 @@ static void testMessageStore(void) store = CertOpenStore(CERT_STORE_PROV_PKCS7, 0, 0, 0, &blob); ok(!store && (GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR), /* win9x */ + broken(GetLastError() == OSS_DATA_ERROR)), /* NT4 */ "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); }

1 0

Austin English : rpcrt4/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: 01ca32ac91a3b00de11eb86a0c68036aae28e563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ca32ac91a3b00de11eb86a0… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 17:50:35 2011 -0800 rpcrt4/tests: Remove win9x hacks. --- dlls/rpcrt4/tests/rpc.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 684b47e..4d62f30 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -119,13 +119,9 @@ static void UuidConversionAndComparison(void) { for (i1 = 0; i1 < 10; i1++) { Uuid1 = Uuid_Table[i1]; rslt=UuidToStringW(&Uuid1, &wstr); - if (rslt==RPC_S_CANNOT_SUPPORT) { - /* Must be Win9x (no Unicode support), skip the tests */ - break; - } - ok( (rslt == RPC_S_OK), "Simple UUID->WString copy\n" ); - ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String\n" ); - ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform\n" ); + ok( (rslt == RPC_S_OK), "Simple UUID->WString copy\n" ); + ok( (UuidFromStringW(wstr, &Uuid2) == RPC_S_OK), "Simple WString->UUID copy from generated UUID String\n" ); + ok( UuidEqual(&Uuid1, &Uuid2, &rslt), "Uuid -> WString -> Uuid transform\n" ); /* invalid uuid tests -- size of valid UUID string=36 */ for (i2 = 0; i2 < 36; i2++) { wx = wstr[i2]; @@ -265,8 +261,7 @@ todo_wine { status = RpcBindingSetAuthInfo(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE, RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); - ok(status == RPC_S_OK || broken(status == RPC_S_UNKNOWN_AUTHN_SERVICE), /* win9x */ - "RpcBindingSetAuthInfo failed (%u)\n", status); + ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%u)\n", status); status = RpcBindingInqAuthInfo(IFoo_IfHandle, NULL, NULL, NULL, NULL, NULL); ok(status == RPC_S_BINDING_HAS_NO_AUTH, "RpcBindingInqAuthInfo failed (%u)\n", @@ -436,14 +431,8 @@ static void test_I_RpcMapWin32Status(void) { LONG win32status; RPC_STATUS rpc_status; - BOOL on_win9x = FALSE; BOOL w2k3_up = FALSE; - /* Win9x always returns the given status */ - win32status = I_RpcMapWin32Status(ERROR_ACCESS_DENIED); - if (win32status == ERROR_ACCESS_DENIED) - on_win9x = TRUE; - /* Windows 2003 and Vista return STATUS_UNSUCCESSFUL if given an unknown status */ win32status = I_RpcMapWin32Status(9999); if (win32status == STATUS_UNSUCCESSFUL) @@ -577,9 +566,6 @@ static void test_I_RpcMapWin32Status(void) expected_win32status = rpc_status; } - if (on_win9x) - missing = TRUE; - ok(win32status == expected_win32status || broken(missing && win32status == rpc_status), "I_RpcMapWin32Status(%d) should have returned 0x%x instead of 0x%x%s\n",

1 0

Austin English : riched20/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: c17df92e5dc475de5ad70478288fcc848d358a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17df92e5dc475de5ad704782… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:36:27 2011 -0800 riched20/tests: Remove win9x hacks. --- dlls/riched20/tests/editor.c | 131 +++++++++++------------------------------ 1 files changed, 35 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c17df92e5dc475de5ad70…

1 0

Austin English : msi/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: 0a284208bd7c726e8640507dc4004eb46b47db1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a284208bd7c726e8640507dc… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:36:03 2011 -0800 msi/tests: Remove win9x hacks. --- dlls/msi/tests/action.c | 39 +-------------------------------------- 1 files changed, 1 insertions(+), 38 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 33f5620..f7919a4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -50,7 +50,6 @@ static HMODULE hsrclient; static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); static BOOL (WINAPI *pSRSetRestorePointA)(RESTOREPOINTINFOA *, STATEMGRSTATUS *); -static BOOL on_win9x; static BOOL is_wow64; static const BOOL is_64bit = sizeof(void *) > sizeof(int); @@ -1850,8 +1849,7 @@ static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, voi DWORD dwCreateDisposition = OPEN_EXISTING; dwAccess = GENERIC_READ | GENERIC_WRITE; - /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) dwCreateDisposition = OPEN_EXISTING; @@ -1965,19 +1963,6 @@ static BOOL is_process_limited(void) return FALSE; } -static BOOL check_win9x(void) -{ - SC_HANDLE scm; - - scm = OpenSCManager(NULL, NULL, GENERIC_ALL); - if (!scm && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - return TRUE; - - CloseServiceHandle(scm); - - return FALSE; -} - static LPSTR get_user_sid(LPSTR *usersid) { HANDLE token; @@ -4613,11 +4598,6 @@ static void test_envvar(void) char buffer[16]; UINT i; - if (on_win9x) - { - win_skip("Environment variables are handled differently on Win9x and WinMe\n"); - return; - } if (is_process_limited()) { skip("process is limited\n"); @@ -4787,11 +4767,6 @@ static void test_start_services(void) BOOL ret; DWORD error = ERROR_SUCCESS; - if (on_win9x) - { - win_skip("Services are not implemented on Win9x and WinMe\n"); - return; - } scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!scm && GetLastError() == ERROR_ACCESS_DENIED) { @@ -4869,11 +4844,6 @@ static void test_delete_services(void) { UINT r; - if (on_win9x) - { - win_skip("Services are not implemented on Win9x and WinMe\n"); - return; - } if (is_process_limited()) { skip("process is limited\n"); @@ -5528,11 +5498,6 @@ static void test_remove_env_strings(void) DWORD type, size; char buffer[0x10]; - if (on_win9x) - { - win_skip("Environment variables are handled differently on win9x and winme\n"); - return; - } if (is_process_limited()) { skip("process is limited\n"); @@ -6038,8 +6003,6 @@ START_TEST(action) init_functionpointers(); - on_win9x = check_win9x(); - if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64);

1 0