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

Francois Gouget : winetest: Quote the Javascript refresh() parameters because they may be non-numerical now.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: tools Branch: master Commit: 30ec1071fdc386a49fb1ac0ee14de2dcd5f24f4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=30ec1071fdc386a49fb1ac0e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 28 01:34:19 2008 +0100 winetest: Quote the Javascript refresh() parameters because they may be non-numerical now. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index 294ad06..7b10e36 100755 --- a/winetest/gather +++ b/winetest/gather @@ -487,7 +487,7 @@ sub singletest($$$) { "$result->{errors}->[1]+$result->{todos}->[1]"; print OUT <<"EOF"; <td class="result $class"><a $href title="$title" - onMouseOver="refresh('$testname', '$label', $mm_count, $mm_todos, $mm_errors, $mm_skips);" + onMouseOver="refresh('$testname', '$label', '$mm_count', '$mm_todos', '$mm_errors', '$mm_skips');" >$msg</a></td> EOF }

1 0

Vitaliy Margolen : devenum: Add Russian translation.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 438868f37796e387cd6f6db5da1f73a7017b6e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438868f37796e387cd6f6db5d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Mar 28 08:34:36 2008 -0600 devenum: Add Russian translation. --- dlls/devenum/devenum.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index af2fed0..916d63e 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -133,3 +133,12 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL 9 "Dispozitiv WaveOut implicit" 10 "Dispozitiv MidiOut implicit" } + +STRINGTABLE DISCARDABLE +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +{ + 7 "Стандартный DirectSound" + 8 "DirectSound: %s" + 9 "Звуковое устройство вывода по умолчанию" + 10 "Устройство вывода MIDI по умолчанию" +}

1 0

Vitaliy Margolen : hhctrl: Add Russian translation.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: a33dff090377f032e6305597130f2af8c3e21e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33dff090377f032e63055971… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Mar 28 08:34:32 2008 -0600 hhctrl: Add Russian translation. --- dlls/hhctrl.ocx/Ru.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Ru.rc b/dlls/hhctrl.ocx/Ru.rc new file mode 100644 index 0000000..4333033 --- /dev/null +++ b/dlls/hhctrl.ocx/Ru.rc @@ -0,0 +1,58 @@ +/* + * HTML Help resources + * Russia Language Support + * + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&��" + IDS_INDEX "&��" + IDS_SEARCH "&��" + IDS_FAVORITES "&��" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "��" + IDTB_CONTRACT "��" + IDTB_STOP "��" + IDTB_REFRESH "��" + IDTB_BACK "��" + IDTB_HOME "� ��" + IDTB_SYNC "��" + IDTB_PRINT "��" + IDTB_OPTIONS "��" + IDTB_FORWARD "� ��" + IDTB_NOTES "��" + IDTB_BROWSE_FWD "�� " + IDTB_BROWSE_BACK "�� " + IDTB_CONTENTS "��" + IDTB_INDEX "��" + IDTB_SEARCH "��" + IDTB_HISTORY "��" + IDTB_FAVORITES "��" + IDTB_JUMP1 "�� 1" + IDTB_JUMP2 "�� 2" + IDTB_CUSTOMIZE "��" + IDTB_ZOOM "��" + IDTB_TOC_NEXT "�� " + IDTB_TOC_PREV "�� " +END diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 1b64557..5fca97b 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -39,5 +39,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Ru.rc" #include "Sv.rc" #include "Tr.rc"

1 0

Roderick Colenbrander : wined3d: Add D3DUSAGE_QUERY_PIXELSHADER_BLENDING to CheckDeviceFormat.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 69a40127c64ddce1908d72556bc0d6dcec86b396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a40127c64ddce1908d72556… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Mar 22 21:41:30 2008 +0000 wined3d: Add D3DUSAGE_QUERY_PIXELSHADER_BLENDING to CheckDeviceFormat. --- dlls/wined3d/directx.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bd66cfd..c8e9325 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2054,6 +2054,23 @@ static BOOL CheckSrgbWriteCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WI return FALSE; } +/* Check if a format support blending in combination with pixel shaders */ +static BOOL CheckPostPixelShaderBlendingCapability(UINT Adapter, WINED3DFORMAT CheckFormat) +{ + const GlPixelFormatDesc *glDesc; + const StaticPixelFormatDesc *desc = getFormatDescEntry(CheckFormat, &GLINFO_LOCATION, &glDesc); + + /* Fail if we weren't able to get a description of the format */ + if(!desc || !glDesc) + return FALSE; + + /* The flags entry of a format contains the post pixel shader blending capability */ + if(glDesc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) + return TRUE; + + return FALSE; +} + /* Check if a texture format is supported on the given adapter */ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) { @@ -2342,6 +2359,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check QUERY_POSTPIXELSHADER_BLENDING support */ + if(Usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { + if(CheckPostPixelShaderBlendingCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + } else { + TRACE_(d3d_caps)("[FAILED] - No query post pixelshader blending support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_SRGBREAD support */ if(Usage & WINED3DUSAGE_QUERY_SRGBREAD) { if(CheckSrgbReadCapability(Adapter, CheckFormat)) { @@ -2464,6 +2491,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check QUERY_POSTPIXELSHADER_BLENDING support */ + if(Usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { + if(CheckPostPixelShaderBlendingCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + } else { + TRACE_(d3d_caps)("[FAILED] - No query post pixelshader blending support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_SRGBREAD support */ if(Usage & WINED3DUSAGE_QUERY_SRGBREAD) { if(CheckSrgbReadCapability(Adapter, CheckFormat)) { @@ -2535,6 +2572,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Check QUERY_POSTPIXELSHADER_BLENDING support */ + if(Usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { + if(CheckPostPixelShaderBlendingCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + } else { + TRACE_(d3d_caps)("[FAILED] - No query post pixelshader blending support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } + /* Check QUERY_SRGBREAD support */ if(Usage & WINED3DUSAGE_QUERY_SRGBREAD) { if(CheckSrgbReadCapability(Adapter, CheckFormat)) {

1 0

Paul Vriens : setupapi/tests: Remove check as we don't care how 'field' is allocated.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: dacb11533ddc8ac683ab78bc6bac9c1777fe82b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dacb11533ddc8ac683ab78bc6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 28 11:17:07 2008 +0100 setupapi/tests: Remove check as we don't care how 'field' is allocated. --- dlls/setupapi/tests/parser.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 8b9a520..d36a729 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -461,11 +461,6 @@ static void test_pSetupGetField(void) field = pSetupGetField( &context, i ); ok( field != NULL, "Failed to get field %i\n", i ); ok( !lstrcmpW( getfield_res[i], field ), "Wrong string returned\n" ); - - ret = HeapFree( GetProcessHeap(), 0, (LPVOID)field ); - ok( !ret, "Expected HeapFree to fail\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError() ); } field = pSetupGetField( &context, 3 );

1 0

Roderick Colenbrander : d3d9: Test post pixelshader blending.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 61f7dc006a2e2db430a09463744326d3619c7671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f7dc006a2e2db430a094637… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 28 02:01:14 2008 +0100 d3d9: Test post pixelshader blending. --- dlls/d3d9/tests/visual.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 177 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61f7dc006a2e2db430a09…

1 0

Roderick Colenbrander : wined3d: Initial post pixelshader blending support. [attempt 2].
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 4eaa424c795c9c5ed4a772898297e692a5a2b2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eaa424c795c9c5ed4a772898… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 28 10:02:39 2008 +0100 wined3d: Initial post pixelshader blending support. [attempt 2]. For each pixel format we store a flag in the table whether it supports post pixelshader blending. Before applying blending or during a context switch we verify that blending is turned off for the format. In case of R32F this gave a 5-6x performance boost (without filtering and software conversion). --- dlls/wined3d/context.c | 6 +- dlls/wined3d/state.c | 14 +++- dlls/wined3d/utils.c | 126 +++++++++++++++++----------------- dlls/wined3d/wined3d_private_types.h | 3 + include/wine/wined3d_gl.h | 1 + 5 files changed, 84 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4eaa424c795c9c5ed4a77…

1 0

Paul Vriens : setupapi/tests: Run tests on win9x again.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: ea64ac8ab712fd199d28e47b1ac4b66d1d93e282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea64ac8ab712fd199d28e47b1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 28 12:17:06 2008 +0100 setupapi/tests: Run tests on win9x again. --- dlls/setupapi/tests/devinst.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index eb72408..2704d31 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -47,6 +47,7 @@ static HKEY (WINAPI *pSetupDiCreateDevRegKeyW)(HDEVINFO, PSP_DEVINFO_DATA, D static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DATA, PSTR, DWORD, PDWORD); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); +static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); static void init_function_pointers(void) @@ -63,6 +64,7 @@ static void init_function_pointers(void) pSetupDiEnumDeviceInterfaces = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInterfaces"); pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); pSetupDiGetDeviceInterfaceDetailA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailA"); + pSetupDiGetDeviceInterfaceDetailW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailW"); pSetupDiInstallClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiInstallClassA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); pSetupDiOpenDevRegKey = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenDevRegKey"); @@ -658,9 +660,15 @@ static void testGetDeviceInterfaceDetail(void) ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", detail->DevicePath); /* Check SetupDiGetDeviceInterfaceDetailW */ - ret = SetupDiGetDeviceInterfaceDetailW(set, &interfaceData, NULL, 0, &size, NULL); - ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got error code: %d\n", GetLastError()); - ok(expectedsize == size, "SetupDiGetDeviceInterfaceDetailW returned wrong reqsize: expected %d, got %d\n", expectedsize, size); + if (pSetupDiGetDeviceInterfaceDetailW) + { + ret = pSetupDiGetDeviceInterfaceDetailW(set, &interfaceData, NULL, 0, &size, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got error code: %d\n", GetLastError()); + ok(expectedsize == size, "SetupDiGetDeviceInterfaceDetailW returned wrong reqsize: expected %d, got %d\n", expectedsize, size); + } + else + skip("SetupDiGetDeviceInterfaceDetailW is not available\n"); + HeapFree(GetProcessHeap(), 0, buf); } pSetupDiDestroyDeviceInfoList(set);

1 0

Paul Vriens : setupapi/tests: Add a few tests for SetupInstallServicesFromInfSectionA.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: 026b252b449bd912916e9d8a4f190305279edb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=026b252b449bd912916e9d8a4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 28 13:20:54 2008 +0100 setupapi/tests: Add a few tests for SetupInstallServicesFromInfSectionA. --- dlls/setupapi/tests/install.c | 147 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 77c74f8..5a99eaa 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -137,6 +137,152 @@ static void test_cmdline(void) ok(DeleteFile(infwithspaces), "Expected source inf to exist, last error was %d\n", GetLastError()); } +static void test_install_svc_from(void) +{ + char inf[2048]; + char path[MAX_PATH]; + HINF infhandle; + BOOL ret; + SC_HANDLE scm_handle, svc_handle; + + /* Bail out if we are on win98 */ + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("OpenSCManagerA is not implemented, we are most likely on win9x\n"); + return; + } + CloseServiceHandle(scm_handle); + + /* Basic inf file to satisfy SetupOpenInfFileA */ + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + /* Nothing but the Version section */ + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, + "Expected ERROR_SECTION_NOT_FOUND, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + + /* Add the section */ + strcat(inf, "[Winetest.Services]\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, + "Expected ERROR_SECTION_NOT_FOUND, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + + /* Add a reference */ + strcat(inf, "AddService=Winetest,,Winetest.Service\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + + /* Add the section */ + strcat(inf, "[Winetest.Service]\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + + /* Just the ServiceBinary */ + strcat(inf, "ServiceBinary=%12%\\winetest.sys\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + + /* Add the ServiceType */ + strcat(inf, "ServiceType=1\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + + /* Add the StartType */ + strcat(inf, "StartType=4\n"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_BAD_SERVICE_INSTALLSECT, + "Expected ERROR_BAD_SERVICE_INSTALLSECT, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + + /* This should be it, the minimal entries to install a service */ + strcat(inf, "ErrorControl=1"); + create_inf_file(inffile, inf); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + todo_wine + { + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + } + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + /* Open the service to see if it's really there */ + svc_handle = OpenServiceA(scm_handle, "Winetest", DELETE); + todo_wine + ok(svc_handle != NULL, "Service was not created\n"); + + SetLastError(0xdeadbeef); + ret = DeleteService(svc_handle); + todo_wine + ok(ret, "Service could not be deleted : %d\n", GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); + + /* TODO: Test the Flags */ +} + static void test_driver_install(void) { HANDLE handle; @@ -254,6 +400,7 @@ START_TEST(install) assert(hhook != 0); test_cmdline(); + test_install_svc_from(); test_driver_install(); UnhookWindowsHookEx(hhook);

1 0

Dmitry Timoshkov : winecfg: Update the DPI trackbar according to the edit box changes.
by Alexandre Julliard 28 Mar '08

28 Mar '08

Module: wine Branch: master Commit: f04013b6b8447245198877b03bb4423c4aed57dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04013b6b8447245198877b03… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Mar 28 18:04:11 2008 +0800 winecfg: Update the DPI trackbar according to the edit box changes. --- programs/winecfg/x11drvdlg.c | 57 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 972ca6d..a631493 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define MAXDPI 480 #define DEFDPI 96 +#define IDT_DPIEDIT 0x1234 + static const WCHAR logpixels_reg[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\\','C','u','r','r','e','n','t','\\','S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; static const WCHAR logpixels[] = {'L','o','g','P','i','x','e','l','s',0}; @@ -253,18 +255,16 @@ static INT read_logpixels_reg(void) static void init_dpi_editbox(HWND hDlg) { - HWND hDpiEditBox = GetDlgItem(hDlg, IDC_RES_DPIEDIT); DWORD dwLogpixels; char szLogpixels[MAXBUFLEN]; updating_ui = TRUE; dwLogpixels = read_logpixels_reg(); - WINE_TRACE("%d\n", (int) dwLogpixels); + WINE_TRACE("%u\n", dwLogpixels); - szLogpixels[0] = 0; - sprintf(szLogpixels, "%d", dwLogpixels); - SendMessage(hDpiEditBox, WM_SETTEXT, 0, (LPARAM) szLogpixels); + sprintf(szLogpixels, "%u", dwLogpixels); + SetDlgItemText(hDlg, IDC_RES_DPIEDIT, szLogpixels); updating_ui = FALSE; } @@ -284,6 +284,40 @@ static void init_trackbar(HWND hDlg) updating_ui = FALSE; } +static void update_dpi_trackbar_from_edit(HWND hDlg, BOOL fix) +{ + DWORD dpi; + + updating_ui = TRUE; + + dpi = GetDlgItemInt(hDlg, IDC_RES_DPIEDIT, NULL, FALSE); + + if (fix) + { + DWORD fixed_dpi = dpi; + + if (dpi < MINDPI) fixed_dpi = MINDPI; + if (dpi > MAXDPI) fixed_dpi = MAXDPI; + + if (fixed_dpi != dpi) + { + char buf[16]; + + dpi = fixed_dpi; + sprintf(buf, "%u", dpi); + SetDlgItemText(hDlg, IDC_RES_DPIEDIT, buf); + } + } + + if (dpi >= MINDPI && dpi <= MAXDPI) + { + SendDlgItemMessage(hDlg, IDC_RES_TRACKBAR, TBM_SETPOS, TRUE, dpi); + set_reg_key_dwordW(HKEY_LOCAL_MACHINE, logpixels_reg, logpixels, dpi); + } + + updating_ui = FALSE; +} + INT_PTR CALLBACK GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -296,6 +330,14 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SHOWWINDOW: set_window_title(hDlg); break; + + case WM_TIMER: + if (wParam == IDT_DPIEDIT) + { + KillTimer(hDlg, IDT_DPIEDIT); + update_dpi_trackbar_from_edit(hDlg, TRUE); + } + break; case WM_COMMAND: switch(HIWORD(wParam)) { @@ -304,6 +346,11 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); if ( ((LOWORD(wParam) == IDC_DESKTOP_WIDTH) || (LOWORD(wParam) == IDC_DESKTOP_HEIGHT)) && !updating_ui ) set_from_desktop_edits(hDlg); + else if (LOWORD(wParam) == IDC_RES_DPIEDIT) + { + update_dpi_trackbar_from_edit(hDlg, FALSE); + SetTimer(hDlg, IDT_DPIEDIT, 1500, NULL); + } break; } case BN_CLICKED: {

1 0