May 2007 - Wine-Commits - list.winehq.org

Francois Gouget : user32/tests: Fix compilation with gcc 2.95.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: a3c0d9a643ac3afbf6c2ff486682e406916fb7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c0d9a643ac3afbf6c2ff486… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 12:10:53 2007 +0200 user32/tests: Fix compilation with gcc 2.95. --- dlls/user32/tests/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 5c94b4c..b270a25 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1991,7 +1991,7 @@ static void test_menu_resource_layout(void) static const struct { MENUITEMTEMPLATEHEADER mith; - WORD data[]; + WORD data[14]; } menu_template = { { 0, 0 }, /* versionNumber, offset */

1 0

Francois Gouget : ntdll: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: 820d9540959bef0c88c41568264d60b51ea9985b URL: http://source.winehq.org/git/wine.git/?a=commit;h=820d9540959bef0c88c415682… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 20 12:08:48 2007 +0200 ntdll: Fix compilation on systems that don't support nameless unions. --- dlls/ntdll/thread.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 30e441d..c97ecd3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -332,8 +332,8 @@ HANDLE thread_init(void) /* initialize time values in user_shared_data */ NtQuerySystemTime( &now ); - user_shared_data->SystemTime.LowPart = now.LowPart; - user_shared_data->SystemTime.High1Time = user_shared_data->SystemTime.High2Time = now.HighPart; + user_shared_data->SystemTime.LowPart = now.u.LowPart; + user_shared_data->SystemTime.High1Time = user_shared_data->SystemTime.High2Time = now.u.HighPart; user_shared_data->u.TickCountQuad = (now.QuadPart - server_start_time) / 10000; user_shared_data->u.TickCount.High2Time = user_shared_data->u.TickCount.High1Time; user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart;

1 0

Rob Shearman : ole32: Fix hosting in main apartments.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: be55a4bbe28a5666b47e2e2b62c008bbffc9b6e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be55a4bbe28a5666b47e2e2b6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat May 19 17:21:00 2007 +0100 ole32: Fix hosting in main apartments. The recently introduced code had a bug where it passed the wrong values into apartment_findfromtype to find the main apartment. Since this is now the only way the function is used, fix this bug by changing apartment_findfromtype to apartment_findmain, which only finds the main apartment. --- dlls/ole32/compobj.c | 29 +++++++---------------------- 1 files changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8e883a8..d9404a1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -474,33 +474,18 @@ APARTMENT *apartment_findfromtid(DWORD tid) return result; } -/* gets an apartment which has a given type. The caller must +/* gets the main apartment if it exists. The caller must * release the reference from the apartment as soon as the apartment pointer * is no longer required. */ -static APARTMENT *apartment_findfromtype(BOOL multi_threaded, BOOL main_apartment) +static APARTMENT *apartment_findmain(void) { - APARTMENT *result = NULL; - struct apartment *apt; + APARTMENT *result; EnterCriticalSection(&csApartment); - if (!multi_threaded && main_apartment) - { - result = MainApartment; - if (result) apartment_addref(result); - LeaveCriticalSection(&csApartment); - return result; - } + result = MainApartment; + if (result) apartment_addref(result); - LIST_FOR_EACH_ENTRY( apt, &apts, struct apartment, entry ) - { - if (apt->multi_threaded == multi_threaded) - { - result = apt; - apartment_addref(result); - break; - } - } LeaveCriticalSection(&csApartment); return result; @@ -624,7 +609,7 @@ static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi if (!multi_threaded && main_apartment) { - APARTMENT *host_apt = apartment_findfromtype(FALSE, FALSE); + APARTMENT *host_apt = apartment_findmain(); if (host_apt) { apartment_hwnd = apartment_getwindow(host_apt); @@ -677,7 +662,7 @@ static HRESULT apartment_hostobject_in_hostapt(struct apartment *apt, BOOL multi * us to create the thread for the host apartment */ if (!apartment_hwnd && !multi_threaded && main_apartment) { - APARTMENT *host_apt = apartment_findfromtype(FALSE, FALSE); + APARTMENT *host_apt = apartment_findmain(); if (host_apt) { apartment_hwnd = apartment_getwindow(host_apt);

1 0

Andrew Talbot : shell32: Exclude unused headers.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: a77715c23b37030b19cdf5bfd6e49f2d7eb1f616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77715c23b37030b19cdf5bfd… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 18 22:16:39 2007 +0100 shell32: Exclude unused headers. --- dlls/shell32/iconcache.c | 1 - dlls/shell32/pidl.c | 1 - dlls/shell32/shell.c | 3 --- dlls/shell32/shell32_main.c | 1 - dlls/shell32/shellreg.c | 2 -- 5 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6645761..133a84a 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -39,7 +39,6 @@ #include "shellapi.h" #include "objbase.h" -#include "shlguid.h" #include "pidl.h" #include "shell32_main.h" #include "undocshell.h" diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index b88c422..ef24927 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -43,7 +43,6 @@ #include "winnls.h" #include "undocshell.h" #include "shell32_main.h" -#include "shellapi.h" #include "shlwapi.h" #include "pidl.h" diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index e8f3fc1..37bf2ec 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -33,16 +33,13 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "winreg.h" #include "wownt32.h" -#include "dlgs.h" #include "shellapi.h" #include "winuser.h" #include "wingdi.h" #include "shlobj.h" #include "shlwapi.h" -#include "ddeml.h" #include "wine/winbase16.h" #include "wine/winuser16.h" diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index ea4b510..84e2c16 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -37,7 +37,6 @@ #include "winuser.h" #include "wingdi.h" #include "shlobj.h" -#include "shlguid.h" #include "shlwapi.h" #include "undocshell.h" diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index a305c8b..9ed8f9a 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -30,9 +30,7 @@ #include "wingdi.h" #include "winuser.h" #include "shlobj.h" -#include "winerror.h" #include "winreg.h" -#include "winnls.h" #include "undocshell.h" #include "wine/winbase16.h"

1 0

Andrew Talbot : shell32: Exclude unused headers.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: 0ad8ef07727ad5609253269e851bbda3d9d40338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad8ef07727ad5609253269e8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 18 22:16:36 2007 +0100 shell32: Exclude unused headers. --- dlls/shell32/autocomplete.c | 1 - dlls/shell32/brsfolder.c | 1 - dlls/shell32/changenotify.c | 1 - dlls/shell32/debughlp.c | 1 - dlls/shell32/folders.c | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index ed32f44..c80069e 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -51,7 +51,6 @@ #include "objbase.h" #include "pidl.h" -#include "shlguid.h" #include "shlobj.h" #include "shldisp.h" #include "debughlp.h" diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 27c2097..16ec906 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -29,7 +29,6 @@ #include "wine/debug.h" #include "undocshell.h" -#include "shlguid.h" #include "pidl.h" #include "shell32_main.h" #include "shellapi.h" diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 6d528ee..9f827eb 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -#include "wingdi.h" #include "shell32_main.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index b1e9238..50bf0dc 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -25,7 +25,6 @@ #include "windef.h" #include "wingdi.h" #include "pidl.h" -#include "shlguid.h" #include "shldisp.h" #include "wine/debug.h" #include "debughlp.h" diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 19fb5c7..2119905 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -33,7 +33,6 @@ #include "objbase.h" #include "undocshell.h" #include "shlguid.h" -#include "winreg.h" #include "wine/debug.h"

1 0

Paul Vriens : advpack/tests: Don't hardcode the system directory.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: 437a3aab9d095f5940ffc776629b33dfe7250f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437a3aab9d095f5940ffc7766… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat May 19 22:34:43 2007 +0200 advpack/tests: Don't hardcode the system directory. --- dlls/advpack/tests/install.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index deac91a..7f83cf8 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -86,6 +86,9 @@ static void test_RunSetupCommand(void) HANDLE hexe; char path[MAX_PATH]; char dir[MAX_PATH]; + char systemdir[MAX_PATH]; + + GetSystemDirectoryA(systemdir, sizeof(systemdir)); /* try an invalid cmd name */ hr = pRunSetupCommand(NULL, NULL, "Install", "Dir", "Title", NULL, 0, NULL); @@ -97,7 +100,7 @@ static void test_RunSetupCommand(void) /* try to run a nonexistent exe */ hexe = (HANDLE)0xdeadbeef; - hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); + hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", systemdir, "Title", &hexe, 0, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); ok(hexe == NULL, "Expcted hexe to be NULL\n"); @@ -113,14 +116,14 @@ static void test_RunSetupCommand(void) /* try to run an exe with the RSC_FLAG_INF flag */ hexe = (HANDLE)0xdeadbeef; - hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); + hr = pRunSetupCommand(NULL, "winver.exe", "Install", systemdir, "Title", &hexe, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); ok(is_spapi_err(hr), "Expected a setupapi error, got %d\n", hr); ok(hexe == (HANDLE)0xdeadbeef, "Expected hexe to be 0xdeadbeef\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); /* run winver.exe */ hexe = (HANDLE)0xdeadbeef; - hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); + hr = pRunSetupCommand(NULL, "winver.exe", "Install", systemdir, "Title", &hexe, 0, NULL); ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %d\n", hr); ok(hexe != NULL, "Expected hexe to be non-NULL\n"); ok(TerminateProcess(hexe, 0), "Expected TerminateProcess to succeed\n");

1 0

Andrew Talbot : shell32: Exclude unused headers.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: 02a36afda22b0a0937e8ed8b7ebc4afff4ff3e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a36afda22b0a0937e8ed8b7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 18 22:16:42 2007 +0100 shell32: Exclude unused headers. --- dlls/shell32/shellstring.c | 2 -- dlls/shell32/shlfsbind.c | 1 - dlls/shell32/shlmenu.c | 1 - dlls/shell32/shv_bg_cmenu.c | 1 - dlls/shell32/shv_item_cmenu.c | 1 - 5 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 6ba920a..a35e15c 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -27,13 +27,11 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "winerror.h" #include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "shlobj.h" -#include "shellapi.h" #include "shlwapi.h" #include "shell32_main.h" #include "undocshell.h" diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index a2d1299..c50e74c 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winuser.h" #include "shlobj.h" #include "shell32_main.h" diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index d498e1f..1da5ba7 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -32,7 +32,6 @@ #include "undocshell.h" #include "shlwapi.h" #include "shell32_main.h" -#include "shlguid.h" #include "pidl.h" #include "wine/debug.h" diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 1ac5815..5beaf1e 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -29,7 +29,6 @@ #include "windef.h" #include "wingdi.h" #include "pidl.h" -#include "shlguid.h" #include "shlobj.h" #include "shell32_main.h" diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 0a358b9..6b6dc81 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -30,7 +30,6 @@ #include "windef.h" #include "wingdi.h" #include "pidl.h" -#include "shlguid.h" #include "undocshell.h" #include "shlobj.h"

1 0

Andrew Talbot : setupapi: Exclude unused headers.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: 9f2a62ed0a41701fd8e0e767b4e20c2988a78f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2a62ed0a41701fd8e0e767b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri May 18 22:16:33 2007 +0100 setupapi: Exclude unused headers. --- dlls/setupapi/fakedll.c | 1 - dlls/setupapi/query.c | 1 - dlls/setupapi/setupx_main.c | 1 - dlls/setupapi/stubs.c | 1 - dlls/setupapi/virtcopy.c | 1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 59dfe08..5bf87c4 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winver.h" #include "winnt.h" #include "winternl.h" #include "wine/unicode.h" diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 3a74717..04b9c4d 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -24,7 +24,6 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "winver.h" #include "setupapi.h" #include "advpub.h" #include "winnls.h" diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c index 2fadb8c..81079d6 100644 --- a/dlls/setupapi/setupx_main.c +++ b/dlls/setupapi/setupx_main.c @@ -65,7 +65,6 @@ #include "winerror.h" #include "wine/winuser16.h" #include "wownt32.h" -#include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "setupapi.h" diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ed6caa2..5704ce6 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" #include "winreg.h" #include "setupapi.h" diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c index f92b455..74bf0fd 100644 --- a/dlls/setupapi/virtcopy.c +++ b/dlls/setupapi/virtcopy.c @@ -28,7 +28,6 @@ #include "winuser.h" #include "winreg.h" #include "wownt32.h" -#include "wingdi.h" #include "winnls.h" #include "setupapi.h" #include "setupx16.h"

1 0

Hans Leidekker : setupapi: Don' t require a valid version section for INF_STYLE_OLDNT files.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: 3cfb018ea62e50fb5afb382decc029dfe0207da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cfb018ea62e50fb5afb382de… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 18 20:24:18 2007 +0200 setupapi: Don't require a valid version section for INF_STYLE_OLDNT files. --- dlls/setupapi/parser.c | 6 +++--- dlls/setupapi/tests/query.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index f77b1a1..6ddc1f2 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -925,7 +925,7 @@ static void append_inf_file( struct inf_file *parent, struct inf_file *child ) * * parse an INF file. */ -static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *error_line ) +static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, DWORD style, UINT *error_line ) { void *buffer; DWORD err = 0; @@ -1002,7 +1002,7 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *err } } if (error_line) *error_line = 0; - err = ERROR_WRONG_INF_STYLE; + if (style & INF_STYLE_WIN4) err = ERROR_WRONG_INF_STYLE; } done: @@ -1145,7 +1145,7 @@ HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR class, DWORD style, UINT *err if (handle != INVALID_HANDLE_VALUE) { - file = parse_file( handle, class, error ); + file = parse_file( handle, class, style, error ); CloseHandle( handle ); } if (!file) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 50d341b..39c91c7 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -101,6 +101,27 @@ static void create_inf_file(LPSTR filename) CloseHandle(hf); } +static void create_inf_file2(LPSTR filename) +{ + char data[1024]; + char *ptr = data; + DWORD dwNumberOfBytesWritten; + HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + append_str(&ptr, "[SourceFileInfo]\n"); + append_str(&ptr, "sp1qfe\\bitsinst.exe=250B3702C7CCD7C2F9E4DAA1555C933E,000600060A28062C,27136,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\bitsprx2.dll=4EBEA67F4BB4EB402E725CA7CA2857AE,000600060A280621,7680,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\bitsprx3.dll=C788A1D9330DA011EF25E95D3BC7BDE5,000600060A280621,7168,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\qmgr.dll=696AC82FB290A03F205901442E0E9589,000600060A280621,361984,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\qmgrprxy.dll=8B5848144829E1BC985EA4C3D8CA7E3F,000600060A280621,17408,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\winhttp.dll=3EC6F518114606CA59D4160322077437,000500010A280615,331776,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\xpob2res.dll=DB83156B9F496F20D1EA70E4ABEC0166,000500010A280622,158720,SP1QFE\n"); + + WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + CloseHandle(hf); +} + static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) { LPSTR filename; @@ -271,7 +292,7 @@ static void test_SetupGetSourceFileLocation(void) { char buffer[MAX_PATH] = "not empty", inf_filename[MAX_PATH]; UINT source_id; - DWORD required; + DWORD required, error; HINF hinf; BOOL ret; @@ -296,6 +317,23 @@ static void test_SetupGetSourceFileLocation(void) pSetupCloseInfFile(hinf); DeleteFileA(inf_filename); + + create_inf_file2(inf_filename); + + SetLastError(0xdeadbeef); + hinf = pSetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + error = GetLastError(); + ok(hinf == INVALID_HANDLE_VALUE, "could open inf file\n"); + ok(error == ERROR_WRONG_INF_STYLE, "got wrong error: %d\n", error); + + hinf = pSetupOpenInfFileA(inf_filename, NULL, INF_STYLE_OLDNT, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + ret = pSetupGetSourceFileLocationA(hinf, NULL, "", &source_id, buffer, sizeof(buffer), &required); + ok(!ret, "SetupGetSourceFileLocation succeeded\n"); + + pSetupCloseInfFile(hinf); + DeleteFileA(inf_filename); } static void test_SetupGetSourceInfo(void)

1 0

Rolf Kalbermatter : advapi32: Fix return value to indicate error when NULL string is passed in.
by Alexandre Julliard May 21, 2007

May 21, 2007

Module: wine Branch: master Commit: ac5dca86ffc8e1b37ad38e84a11629d25ee12c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5dca86ffc8e1b37ad38e84a… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Fri May 18 21:02:20 2007 +0200 advapi32: Fix return value to indicate error when NULL string is passed in. --- dlls/advapi32/service.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index e9a1160..23fdd5c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2078,6 +2078,9 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, size = *lpcchBuffer; ret = RegGetValueA(hscm->hkey, lpServiceName, "DisplayName", RRF_RT_REG_SZ, &type, lpDisplayName, &size); + if (!ret && !lpDisplayName && size) + ret = ERROR_MORE_DATA; + if (ret) { if (lpDisplayName && *lpcchBuffer) *lpDisplayName = 0; @@ -2116,6 +2119,9 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, size = *lpcchBuffer * sizeof(WCHAR); ret = RegGetValueW(hscm->hkey, lpServiceName, szDisplayName, RRF_RT_REG_SZ, &type, lpDisplayName, &size); + if (!ret && !lpDisplayName && size) + ret = ERROR_MORE_DATA; + if (ret) { if (lpDisplayName && *lpcchBuffer) *lpDisplayName = 0;

1 0