May 2018 - Wine-devel - list.winehq.org

[PATCH] ntdll: Add LdrRegisterDllNotification stub
by Alex Henrie 15 May '18

15 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45205 Based on a Wine Staging patch by Michael Müller. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/loader.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a3dd801a1..01d7db7c0c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1461,6 +1461,16 @@ NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, return STATUS_SUCCESS; } +/****************************************************************** + * LdrRegisterDllNotification (NTDLL.@) + */ +NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FUNCTION callback, + void *context, void **cookie) +{ + FIXME( "(%04x, %p, %p, %p) stub!\n", flags, callback, context, cookie ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a58d7e37d..73b3103ba1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -83,6 +83,7 @@ @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall LdrRegisterDllNotification(long ptr ptr ptr) @ stdcall LdrResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber diff --git a/include/winternl.h b/include/winternl.h index c84e6d7f88..308bd5818e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,32 @@ typedef struct _LDR_MODULE HANDLE ActivationContext; } LDR_MODULE, *PLDR_MODULE; +typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA +{ + ULONG Flags; + PCUNICODE_STRING FullDllName; + PCUNICODE_STRING BaseDllName; + PVOID DllBase; + ULONG SizeOfImage; +} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; + +typedef struct _LDR_DLL_UNLOADED_NOTIFICATION_DATA +{ + ULONG Flags; + PCUNICODE_STRING FullDllName; + PCUNICODE_STRING BaseDllName; + PVOID DllBase; + ULONG SizeOfImage; +} LDR_DLL_UNLOADED_NOTIFICATION_DATA, *PLDR_DLL_UNLOADED_NOTIFICATION_DATA; + +typedef union _LDR_DLL_NOTIFICATION_DATA +{ + LDR_DLL_LOADED_NOTIFICATION_DATA Loaded; + LDR_DLL_UNLOADED_NOTIFICATION_DATA Unloaded; +} LDR_DLL_NOTIFICATION_DATA, *PLDR_DLL_NOTIFICATION_DATA; + +typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICATION_DATA*, void*); + /* those defines are (some of the) regular LDR_MODULE.Flags values */ #define LDR_IMAGE_IS_DLL 0x00000004 #define LDR_LOAD_IN_PROGRESS 0x00001000 -- 2.17.0

1 0

[PATCH] d3d11/tests: Add test for depth clip.
by Zebediah Figura 15 May '18

15 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..ca6130b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26567,6 +26567,79 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int count; + D3D11_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D11DeviceContext_RSGetViewports(context, &count, &vp); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D11DepthStencilView_Release(dsv); + ID3D11Texture2D_Release(texture); + ID3D11RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -26704,4 +26777,5 @@ START_TEST(d3d11) test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); } -- 2.7.4

1 0

[PATCH] wsdapi/tests: Expand ProbeHandler tests.
by Owen Rudge 14 May '18

14 May '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 118 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 107 insertions(+), 11 deletions(-)

2 1

[PATCH 1/4] gdiplus: Use ARRAY_SIZE() macro.
by Nikolay Sivov 14 May '18

14 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/font.c | 4 ++-- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/image.c | 6 +++--- dlls/gdiplus/metafile.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0114a510ca..3aeb654086 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -232,7 +232,7 @@ static const char HatchBrushes[][8] = { GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) { - if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) + if (hatchstyle < ARRAY_SIZE(HatchBrushes)) { *result = HatchBrushes[hatchstyle]; return Ok; diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f99b026b25..64778bb226 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1367,7 +1367,7 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) case TT_PLATFORM_MACINTOSH: if (!IsValidCodePage( get_mac_code_page( name ))) return 0; name_lang = GET_BE_WORD(name->language_id); - if (name_lang >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name_lang >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[name_lang]; break; case TT_PLATFORM_APPLE_UNICODE: @@ -1377,7 +1377,7 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) case TT_APPLE_ID_ISO_10646: case TT_APPLE_ID_UNICODE_2_0: name_lang = GET_BE_WORD(name->language_id); - if (name_lang >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name_lang >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[name_lang]; break; default: diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index ea79f1183c..9fff578a28 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -35,6 +35,8 @@ #include "gdiplus.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) #define MAX_DASHLEN (16) /* this is a limitation of gdi */ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b03630c55c..9841857e63 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2554,7 +2554,7 @@ static UINT vt_to_itemtype(UINT vt) { VT_BLOB, PropertyTagTypeUndefined } }; UINT i; - for (i = 0; i < sizeof(vt2type)/sizeof(vt2type[0]); i++) + for (i = 0; i < ARRAY_SIZE(vt2type); i++) { if (vt2type[i].vt == vt) return vt2type[i].type; } @@ -3454,10 +3454,10 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI { if (name.vt == VT_LPSTR) { - for (j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++) + for (j = 0; j < ARRAY_SIZE(keywords); j++) if (!strcmp(keywords[j].name, name.u.pszVal)) break; - if (j < sizeof(keywords)/sizeof(keywords[0]) && !keywords[j].seen) + if (j < ARRAY_SIZE(keywords) && !keywords[j].seen) { keywords[j].seen = TRUE; item = create_prop(keywords[j].propid, &value); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 77673a7ea3..08dde2fec6 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -606,7 +606,7 @@ void METAFILE_Free(GpMetafile *metafile) if (metafile->record_stream) IStream_Release(metafile->record_stream); - for (i = 0; i < sizeof(metafile->objtable)/sizeof(metafile->objtable[0]); i++) + for (i = 0; i < ARRAY_SIZE(metafile->objtable); i++) metafile_free_object_table_entry(metafile, i); } -- 2.17.0

4 13

[PATCH] winemac: Transform the process to a GUI app on an attempt to change the display mode.
by Ken Thomases 14 May '18

14 May '18

It had only been done when a window is shown. Some games change the display mode before showing their first window. Following Mac conventions, the Mac driver does not apply display mode changes when it's not the active GUI app. If such a game were to change the mode and then query display-mode-related info, it would get info for the original mode, not the requested mode. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 46176f7..239c11f 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -843,7 +843,6 @@ - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID } else { - BOOL active = [NSApp isActive]; CGDisplayModeRef currentMode; NSArray* modes; @@ -866,6 +865,10 @@ - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID if (!modes.count) return FALSE; + [self transformProcessToForeground]; + + BOOL active = [NSApp isActive]; + if ([originalDisplayModes count] || displaysCapturedForFullscreen || !active || CGCaptureAllDisplays() == CGDisplayNoErr) { -- 2.10.2

1 0

[PATCH Wine Translations] Update Korean translations.
by 김건우 14 May '18

14 May '18

1 0

[PATCH] winebus: Print SDL error message when SDL cannot be initialized.
by Józef Kucia 14 May '18

14 May '18

SDL_Init(SDL_INIT_HAPTIC) fails if SDL is built without haptic support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 03e7cb3e2ba2..159727f6bce4 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -910,7 +910,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) { - ERR("Can't Init SDL\n"); + ERR("Can't init SDL: %s\n", pSDL_GetError()); return STATUS_UNSUCCESSFUL; } -- 2.16.1

2 1

[PATCH] po: Update Czech translation
by AsciiWolf 14 May '18

14 May '18

Hello, I have updated the Czech translation. The last time it was updated was in 2013. Feel free to merge this patch. Regards, Daniel Rusek

1 1

[PATCH 1/5] msi/tests: Add a header for some common functions.
by Zebediah Figura 14 May '18

14 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 469 +---------------------------------------- dlls/msi/tests/install.c | 72 +++---- dlls/msi/tests/msi.c | 527 +++-------------------------------------------- dlls/msi/tests/utils.h | 60 ++++++ 4 files changed, 117 insertions(+), 1011 deletions(-) create mode 100644 dlls/msi/tests/utils.h diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 31cc981..8e72ff4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -34,6 +34,7 @@ #include <winsvc.h> #include "wine/test.h" +#include "utils.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); @@ -46,9 +47,7 @@ static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) static UINT (WINAPI *pMsiQueryFeatureStateExA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR *); -static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -60,11 +59,6 @@ static BOOL is_wow64; static const BOOL is_64bit = sizeof(void *) > sizeof(int); static const char *msifile = "msitest.msi"; -static CHAR CURR_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR[MAX_PATH]; -static CHAR COMMON_FILES_DIR[MAX_PATH]; -static CHAR APP_DATA_DIR[MAX_PATH]; -static CHAR WINDOWS_DIR[MAX_PATH]; /* msi database data */ @@ -1679,15 +1673,6 @@ static const char rep_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; -typedef struct _msi_table -{ - const char *filename; - const char *data; - unsigned int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table env_tables[] = { ADD_TABLE(component), @@ -2152,110 +2137,6 @@ cleanup: /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 0x7FFFFFFF -#define FOLDER_THRESHOLD 900000 - -/* the FCI callbacks */ - -static void * CDECL mem_alloc(ULONG cb) -{ - return HeapAlloc(GetProcessHeap(), 0, cb); -} - -static void CDECL mem_free(void *memory) -{ - HeapFree(GetProcessHeap(), 0, memory); -} - -static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) -{ - sprintf(pccab->szCab, pv, pccab->iCab); - return TRUE; -} - -static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) -{ - return 0; -} - -static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, - BOOL fContinuation, void *pv) -{ - return 0; -} - -static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) -{ - HANDLE handle; - DWORD dwAccess = 0; - DWORD dwShareMode = 0; - DWORD dwCreateDisposition = OPEN_EXISTING; - - dwAccess = GENERIC_READ | GENERIC_WRITE; - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - - if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) - dwCreateDisposition = OPEN_EXISTING; - else - dwCreateDisposition = CREATE_NEW; - - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszFile); - - return (INT_PTR)handle; -} - -static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwRead; - BOOL res; - - res = ReadFile(handle, memory, cb, &dwRead, NULL); - ok(res, "Failed to ReadFile\n"); - - return dwRead; -} - -static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwWritten; - BOOL res; - - res = WriteFile(handle, memory, cb, &dwWritten, NULL); - ok(res, "Failed to WriteFile\n"); - - return dwWritten; -} - -static int CDECL fci_close(INT_PTR hf, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - ok(CloseHandle(handle), "Failed to CloseHandle\n"); - - return 0; -} - -static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD ret; - - ret = SetFilePointer(handle, dist, NULL, seektype); - ok(ret != INVALID_SET_FILE_POINTER, "Failed to SetFilePointer\n"); - - return ret; -} - -static int CDECL fci_delete(char *pszFile, int *err, void *pv) -{ - BOOL ret = DeleteFileA(pszFile); - ok(ret, "Failed to DeleteFile %s\n", pszFile); - - return 0; -} static void init_functionpointers(void) { @@ -2274,9 +2155,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hmsi, MsiQueryFeatureStateExA); - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) @@ -2287,44 +2166,6 @@ static void init_functionpointers(void) #undef GET_PROC } -static BOOL is_process_limited(void) -{ - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group = NULL; - BOOL IsInGroup; - HANDLE token; - - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - FreeSid(Group); - return FALSE; - } - FreeSid(Group); - - if (!IsInGroup) - { - /* Only administrators have enough privileges for these tests */ - return TRUE; - } - - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; -} - static char *get_user_sid(void) { HANDLE token; @@ -2349,185 +2190,6 @@ static char *get_user_sid(void) return usersid; } -static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) -{ - LPSTR tempname; - - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - GetTempFileNameA(".", "xx", 0, tempname); - - if (tempname && (strlen(tempname) < (unsigned)cbTempName)) - { - lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); - return TRUE; - } - - HeapFree(GetProcessHeap(), 0, tempname); - - return FALSE; -} - -static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) -{ - BY_HANDLE_FILE_INFORMATION finfo; - FILETIME filetime; - HANDLE handle; - DWORD attrs; - BOOL res; - - handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); - - res = GetFileInformationByHandle(handle, &finfo); - ok(res, "Expected GetFileInformationByHandle to succeed\n"); - - FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); - FileTimeToDosDateTime(&filetime, pdate, ptime); - - attrs = GetFileAttributesA(pszName); - ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); - - return (INT_PTR)handle; -} - -static BOOL add_file(HFCI hfci, const char *file, TCOMP compress) -{ - char path[MAX_PATH]; - char filename[MAX_PATH]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - lstrcpyA(filename, file); - - return FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, - progress, get_open_info, compress); -} - -static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) -{ - ZeroMemory(pCabParams, sizeof(CCAB)); - - pCabParams->cb = max_size; - pCabParams->cbFolderThresh = FOLDER_THRESHOLD; - pCabParams->setID = 0xbeef; - pCabParams->iCab = 1; - lstrcpyA(pCabParams->szCabPath, CURR_DIR); - lstrcatA(pCabParams->szCabPath, "\\"); - lstrcpyA(pCabParams->szCab, name); -} - -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) -{ - CCAB cabParams; - LPCSTR ptr; - HFCI hfci; - ERF erf; - BOOL res; - - set_cab_parameters(&cabParams, name, max_size); - - hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, - fci_read, fci_write, fci_close, fci_seek, fci_delete, - get_temp_file, &cabParams, NULL); - - ok(hfci != NULL, "Failed to create an FCI context\n"); - - ptr = files; - while (*ptr) - { - res = add_file(hfci, ptr, tcompTYPE_MSZIP); - ok(res, "Failed to add file: %s\n", ptr); - ptr += lstrlenA(ptr) + 1; - } - - res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); - ok(res, "Failed to flush the cabinet\n"); - - res = FCIDestroy(hfci); - ok(res, "Failed to destroy the cabinet\n"); -} - -static BOOL get_user_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_CURRENT_USER, - "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "AppData", 0, &type, (LPBYTE)APP_DATA_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - RegCloseKey(hkey); - return TRUE; -} - -static BOOL get_system_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)PROG_FILES_DIR, &size) && - RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "CommonFilesDir (x86)", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size) && - RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - RegCloseKey(hkey); - - if (!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) - return FALSE; - - return TRUE; -} - -static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) -{ - HANDLE file; - DWORD written; - - file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - return; - - WriteFile(file, data, strlen(data), &written, NULL); - - if (size) - { - SetFilePointer(file, size, NULL, FILE_BEGIN); - SetEndOfFile(file); - } - - CloseHandle(file); -} - -#define create_file(name, size) create_file_data(name, name, size) - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); @@ -2549,20 +2211,6 @@ static void create_test_files(void) DeleteFileA("five.txt"); } -static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, rel_path); - - if (is_file) - return DeleteFileA(path); - else - return RemoveDirectoryA(path); -} - static void delete_test_files(void) { DeleteFileA("msitest.msi"); @@ -2578,89 +2226,6 @@ static void delete_test_files(void) RemoveDirectoryA("msitest"); } -static void write_file(const CHAR *filename, const char *data, int data_size) -{ - DWORD size; - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hf, data, data_size, &size, NULL); - CloseHandle(hf); -} - -static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, const char *template) -{ - MSIHANDLE summary; - UINT r; - - r = MsiGetSummaryInformationA(db, NULL, 5, &summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TEMPLATE, VT_LPSTR, 0, NULL, template); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, wordcount, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* write the summary changes back to the stream */ - r = MsiSummaryInfoPersist(summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(summary); -} - -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template) -{ - MSIHANDLE db; - UINT r; - WCHAR *nameW; - int j, len; - - len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - if (!(nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); - - r = MsiOpenDatabaseW(nameW, MSIDBOPEN_CREATE, &db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* import the tables into the database */ - for (j = 0; j < num_tables; j++) - { - const msi_table *table = &tables[j]; - - write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); - - r = MsiDatabaseImportA(db, CURR_DIR, table->filename); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - DeleteFileA(table->filename); - } - - write_msi_summary_info(db, version, wordcount, template); - - r = MsiDatabaseCommit(db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(db); - HeapFree( GetProcessHeap(), 0, nameW ); -} - static BOOL notify_system_change(DWORD event_type, STATEMGRSTATUS *status) { RESTOREPOINTINFOA spec; @@ -2689,22 +2254,6 @@ static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access ) return RegDeleteKeyA( key, subkey ); } -static BOOL file_exists(LPCSTR file) -{ - return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; -} - -static BOOL pf_exists(LPCSTR file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - return file_exists(path); -} - static void delete_pfmsitest_files(void) { SHFILEOPSTRUCTA shfl; @@ -4615,22 +4164,6 @@ error: RemoveDirectoryA("msitest"); } -static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - if (is_file) - create_file_data(path, data, 500); - else - CreateDirectoryA(path, NULL); -} - -#define create_pf(file, is_file) create_pf_data(file, file, is_file) - static void test_remove_files(void) { UINT r; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ac2c837..a2b95d1 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -35,6 +35,7 @@ #include <shellapi.h> #include "wine/test.h" +#include "utils.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE*); @@ -43,9 +44,7 @@ static UINT (WINAPI *pMsiSourceListEnumSourcesA) static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); -static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); @@ -65,12 +64,12 @@ static const char *mstfile = "winetest.mst"; static const WCHAR msifileW[] = {'m','s','i','t','e','s','t','.','m','s','i',0}; static const WCHAR msifile2W[] = {'w','i','n','e','t','e','s','t','2','.','m','s','i',0}; -static CHAR CURR_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR_NATIVE[MAX_PATH]; -static CHAR COMMON_FILES_DIR[MAX_PATH]; -static CHAR APP_DATA_DIR[MAX_PATH]; -static CHAR WINDOWS_DIR[MAX_PATH]; +char CURR_DIR[MAX_PATH]; +char PROG_FILES_DIR[MAX_PATH]; +char PROG_FILES_DIR_NATIVE[MAX_PATH]; +char COMMON_FILES_DIR[MAX_PATH]; +char APP_DATA_DIR[MAX_PATH]; +char WINDOWS_DIR[MAX_PATH]; static const char *customdll; @@ -1348,15 +1347,6 @@ static const CHAR x64_directory_dat[] = "ProgramFiles64Folder\tTARGETDIR\t.\n" "TARGETDIR\t\tSourceDir"; -typedef struct _msi_table -{ - const CHAR *filename; - const CHAR *data; - int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table tables[] = { ADD_TABLE(component), @@ -2084,8 +2074,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; @@ -2166,9 +2155,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiSourceListEnumSourcesA); GET_PROC(hmsi, MsiGetComponentPathExA); - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) GET_PROC(hkernel32, Wow64DisableWow64FsRedirection); @@ -2181,18 +2168,16 @@ static void init_functionpointers(void) #undef GET_PROC } -static BOOL is_process_limited(void) +BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; PSID Group = NULL; BOOL IsInGroup; HANDLE token; - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) + !CheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); FreeSid(Group); @@ -2206,7 +2191,7 @@ static BOOL is_process_limited(void) return TRUE; } - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { BOOL ret; TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; @@ -2303,7 +2288,7 @@ static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_siz lstrcpyA(pCabParams->szCab, name); } -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) +void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) { CCAB cabParams; LPCSTR ptr; @@ -2334,7 +2319,7 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) ok(res, "Failed to destroy the cabinet\n"); } -static BOOL get_user_dirs(void) +BOOL get_user_dirs(void) { HKEY hkey; DWORD type, size; @@ -2353,7 +2338,7 @@ static BOOL get_user_dirs(void) return TRUE; } -static BOOL get_system_dirs(void) +BOOL get_system_dirs(void) { HKEY hkey; DWORD type, size; @@ -2390,7 +2375,7 @@ static BOOL get_system_dirs(void) return TRUE; } -static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) +void create_file_data(LPCSTR name, LPCSTR data, DWORD size) { HANDLE file; DWORD written; @@ -2410,8 +2395,6 @@ static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) CloseHandle(file); } -#define create_file(name, size) create_file_data(name, name, size) - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); @@ -2432,7 +2415,7 @@ static void create_test_files(void) DeleteFileA("five.txt"); } -static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) +BOOL delete_pf(const CHAR *rel_path, BOOL is_file) { CHAR path[MAX_PATH]; @@ -2568,17 +2551,8 @@ static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, MsiCloseHandle(summary); } -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033", \ - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template, \ - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template, const char *packagecode) +void create_database_wordcount(const CHAR *name, const msi_table *tables, int num_tables, + INT version, INT wordcount, const char *template, const char *packagecode) { MSIHANDLE db; UINT r; @@ -3018,7 +2992,7 @@ static void create_cc_test_files(void) DeleteFileA("caesar"); } -static void delete_cab_files(void) +void delete_cab_files(void) { SHFILEOPSTRUCTA shfl; CHAR path[MAX_PATH+10]; @@ -3536,12 +3510,12 @@ error: RemoveDirectoryA("msitest"); } -static BOOL file_exists(LPCSTR file) +BOOL file_exists(const char *file) { return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; } -static BOOL pf_exists(LPCSTR file) +BOOL pf_exists(const char *file) { CHAR path[MAX_PATH]; @@ -3574,7 +3548,7 @@ static void delete_pfmsitest_files(void) RemoveDirectoryA(path); } -static UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query) +UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query) { MSIHANDLE hview = 0; UINT r; @@ -3976,7 +3950,7 @@ error: RemoveDirectoryA("msitest"); } -static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) +void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) { CHAR path[MAX_PATH]; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 85ab7ba..3778019 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -32,19 +32,13 @@ #include <objidl.h> #include "wine/test.h" +#include "utils.h" static BOOL is_wow64; static const char msifile[] = "winetest.msi"; static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; -static char CURR_DIR[MAX_PATH]; -static char PROG_FILES_DIR[MAX_PATH]; -static char PROG_FILES_DIR_NATIVE[MAX_PATH]; -static char COMMON_FILES_DIR[MAX_PATH]; -static char WINDOWS_DIR[MAX_PATH]; -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); -static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -110,328 +104,19 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiEnumComponentsExA) GET_PROC(hmsi, MsiSourceListGetInfoA) - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA) - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) #undef GET_PROC } -static BOOL get_system_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)PROG_FILES_DIR, &size) && - RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - size = MAX_PATH; - if (RegQueryValueExA(hkey, "CommonFilesDir (x86)", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size) && - RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR_NATIVE, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - RegCloseKey(hkey); - if (!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) return FALSE; - return TRUE; -} - -static BOOL file_exists(const char *file) -{ - return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; -} - -static BOOL pf_exists(const char *file) -{ - char path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - return file_exists(path); -} - -static BOOL delete_pf(const char *rel_path, BOOL is_file) -{ - char path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, rel_path); - - if (is_file) - return DeleteFileA(path); - else - return RemoveDirectoryA(path); -} - -static BOOL is_process_limited(void) -{ - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group = NULL; - BOOL IsInGroup; - HANDLE token; - - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - FreeSid(Group); - return FALSE; - } - FreeSid(Group); - - if (!IsInGroup) - { - /* Only administrators have enough privileges for these tests */ - return TRUE; - } - - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; -} - /* cabinet definitions */ /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 0x7FFFFFFF #define FOLDER_THRESHOLD 900000 -/* the FCI callbacks */ - -static void * CDECL mem_alloc(ULONG cb) -{ - return HeapAlloc(GetProcessHeap(), 0, cb); -} - -static void CDECL mem_free(void *memory) -{ - HeapFree(GetProcessHeap(), 0, memory); -} - -static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) -{ - sprintf(pccab->szCab, pv, pccab->iCab); - return TRUE; -} - -static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) -{ - return 0; -} - -static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, - BOOL fContinuation, void *pv) -{ - return 0; -} - -static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) -{ - HANDLE handle; - DWORD dwAccess = 0; - DWORD dwShareMode = 0; - 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; - - if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) - dwCreateDisposition = OPEN_EXISTING; - else - dwCreateDisposition = CREATE_NEW; - - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszFile); - - return (INT_PTR)handle; -} - -static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwRead; - BOOL res; - - res = ReadFile(handle, memory, cb, &dwRead, NULL); - ok(res, "Failed to ReadFile\n"); - - return dwRead; -} - -static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwWritten; - BOOL res; - - res = WriteFile(handle, memory, cb, &dwWritten, NULL); - ok(res, "Failed to WriteFile\n"); - - return dwWritten; -} - -static int CDECL fci_close(INT_PTR hf, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - ok(CloseHandle(handle), "Failed to CloseHandle\n"); - - return 0; -} - -static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD ret; - - ret = SetFilePointer(handle, dist, NULL, seektype); - ok(ret != INVALID_SET_FILE_POINTER, "Failed to SetFilePointer\n"); - - return ret; -} - -static int CDECL fci_delete(char *pszFile, int *err, void *pv) -{ - BOOL ret = DeleteFileA(pszFile); - ok(ret, "Failed to DeleteFile %s\n", pszFile); - - return 0; -} - -static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) -{ - LPSTR tempname; - - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - GetTempFileNameA(".", "xx", 0, tempname); - - if (tempname && (strlen(tempname) < (unsigned)cbTempName)) - { - lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); - return TRUE; - } - - HeapFree(GetProcessHeap(), 0, tempname); - - return FALSE; -} - -static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) -{ - BY_HANDLE_FILE_INFORMATION finfo; - FILETIME filetime; - HANDLE handle; - DWORD attrs; - BOOL res; - - handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); - - res = GetFileInformationByHandle(handle, &finfo); - ok(res, "Expected GetFileInformationByHandle to succeed\n"); - - FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); - FileTimeToDosDateTime(&filetime, pdate, ptime); - - attrs = GetFileAttributesA(pszName); - ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); - - return (INT_PTR)handle; -} - -static BOOL add_file(HFCI hfci, const char *file, TCOMP compress) -{ - char path[MAX_PATH]; - char filename[MAX_PATH]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - lstrcpyA(filename, file); - - return FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, - progress, get_open_info, compress); -} - -static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) -{ - ZeroMemory(pCabParams, sizeof(CCAB)); - - pCabParams->cb = max_size; - pCabParams->cbFolderThresh = FOLDER_THRESHOLD; - pCabParams->setID = 0xbeef; - pCabParams->iCab = 1; - lstrcpyA(pCabParams->szCabPath, CURR_DIR); - lstrcatA(pCabParams->szCabPath, "\\"); - lstrcpyA(pCabParams->szCab, name); -} - -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) -{ - CCAB cabParams; - LPCSTR ptr; - HFCI hfci; - ERF erf; - BOOL res; - - set_cab_parameters(&cabParams, name, max_size); - - hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, - fci_read, fci_write, fci_close, fci_seek, fci_delete, - get_temp_file, &cabParams, NULL); - - ok(hfci != NULL, "Failed to create an FCI context\n"); - - ptr = files; - while (*ptr) - { - res = add_file(hfci, ptr, tcompTYPE_MSZIP); - ok(res, "Failed to add file: %s\n", ptr); - ptr += lstrlenA(ptr) + 1; - } - - res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); - ok(res, "Failed to flush the cabinet\n"); - - res = FCIDestroy(hfci); - ok(res, "Failed to destroy the cabinet\n"); -} - static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) { WCHAR dbW[MAX_PATH], cabinetW[MAX_PATH]; @@ -469,24 +154,6 @@ static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) return TRUE; } -static void delete_cab_files(void) -{ - SHFILEOPSTRUCTA shfl; - CHAR path[MAX_PATH+10]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\*.cab"); - path[strlen(path) + 1] = '\0'; - - shfl.hwnd = NULL; - shfl.wFunc = FO_DELETE; - shfl.pFrom = path; - shfl.pTo = NULL; - shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT; - - SHFileOperationA(&shfl); -} - /* msi database data */ static const char directory_dat[] = @@ -908,15 +575,6 @@ static const char cl_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallFinalize\t\t5000\n"; -typedef struct _msi_table -{ - const CHAR *filename; - const CHAR *data; - int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table tables[] = { ADD_TABLE(directory), @@ -1043,107 +701,6 @@ static const msi_table cl_tables[] = ADD_TABLE(property) }; -static void write_file(const CHAR *filename, const char *data, int data_size) -{ - DWORD size; - - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hf, data, data_size, &size, NULL); - CloseHandle(hf); -} - -static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, const char *template) -{ - MSIHANDLE summary; - UINT r; - - r = MsiGetSummaryInformationA(db, NULL, 5, &summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TEMPLATE, VT_LPSTR, 0, NULL, template); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, wordcount, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* write the summary changes back to the stream */ - r = MsiSummaryInfoPersist(summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(summary); -} - -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template) -{ - MSIHANDLE db; - UINT r; - WCHAR *nameW; - int j, len; - - len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - if (!(nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); - - r = MsiOpenDatabaseW(nameW, MSIDBOPEN_CREATE, &db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* import the tables into the database */ - for (j = 0; j < num_tables; j++) - { - const msi_table *table = &tables[j]; - - write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); - - r = MsiDatabaseImportA(db, CURR_DIR, table->filename); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - DeleteFileA(table->filename); - } - - write_msi_summary_info(db, version, wordcount, template); - - r = MsiDatabaseCommit(db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(db); - HeapFree( GetProcessHeap(), 0, nameW ); -} - -static UINT run_query(MSIHANDLE hdb, const char *query) -{ - MSIHANDLE hview = 0; - UINT r; - - r = MsiDatabaseOpenViewA(hdb, query, &hview); - if (r != ERROR_SUCCESS) - return r; - - r = MsiViewExecute(hview, 0); - if (r == ERROR_SUCCESS) - r = MsiViewClose(hview); - MsiCloseHandle(hview); - return r; -} - static UINT set_summary_info(MSIHANDLE hdb, LPSTR prodcode) { UINT res; @@ -1207,7 +764,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) set_summary_info(hdb, prodcode); - res = run_query(hdb, + res = run_query(hdb, 0, "CREATE TABLE `Directory` ( " "`Directory` CHAR(255) NOT NULL, " "`Directory_Parent` CHAR(255), " @@ -1215,7 +772,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) "PRIMARY KEY `Directory`)"); ok(res == ERROR_SUCCESS , "Failed to create directory table\n"); - res = run_query(hdb, + res = run_query(hdb, 0, "CREATE TABLE `Property` ( " "`Property` CHAR(72) NOT NULL, " "`Value` CHAR(255) " @@ -1225,7 +782,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) sprintf(query, "INSERT INTO `Property` " "(`Property`, `Value`) " "VALUES( 'ProductCode', '%s' )", prodcode); - res = run_query(hdb, query); + res = run_query(hdb, 0, query); ok(res == ERROR_SUCCESS , "Failed\n"); res = MsiDatabaseCommit(hdb); @@ -1428,39 +985,21 @@ static void test_getcomponentpath(void) ok( r == INSTALLSTATE_UNKNOWN, "wrong return value\n"); } -static void create_file(LPCSTR name, LPCSTR data, DWORD size) -{ - HANDLE file; - DWORD written; - - file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, data, strlen(data), &written, NULL); - - if (size) - { - SetFilePointer(file, size, NULL, FILE_BEGIN); - SetEndOfFile(file); - } - - CloseHandle(file); -} - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); - create_file("msitest\\one.txt", "msitest\\one.txt", 100); + create_file("msitest\\one.txt", 100); CreateDirectoryA("msitest\\first", NULL); - create_file("msitest\\first\\two.txt", "msitest\\first\\two.txt", 100); + create_file("msitest\\first\\two.txt", 100); CreateDirectoryA("msitest\\second", NULL); - create_file("msitest\\second\\three.txt", "msitest\\second\\three.txt", 100); + create_file("msitest\\second\\three.txt", 100); - create_file("four.txt", "four.txt", 100); - create_file("five.txt", "five.txt", 100); + create_file("four.txt", 100); + create_file("five.txt", 100); create_cab_file("msitest.cab", MEDIA_SIZE, "four.txt\0five.txt\0"); - create_file("msitest\\filename", "msitest\\filename", 100); - create_file("msitest\\service.exe", "msitest\\service.exe", 100); + create_file("msitest\\filename", 100); + create_file("msitest\\service.exe", 100); DeleteFileA("four.txt"); DeleteFileA("five.txt"); @@ -1559,7 +1098,7 @@ static void test_MsiGetFileHash(void) { int ret; - create_file(name, hash_data[i].data, hash_data[i].size); + create_file_data(name, hash_data[i].data, hash_data[i].size); memset(&hash, 0, sizeof(MSIFILEHASHINFO)); hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); @@ -3030,7 +2569,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 'a'; @@ -3134,7 +2673,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3244,7 +2783,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3326,7 +2865,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3403,7 +2942,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3537,7 +3076,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3600,7 +3139,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3676,7 +3215,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "C:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3731,7 +3270,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3773,7 +3312,7 @@ static void test_MsiProvideComponent(void) } create_test_files(); - create_file("msitest\\sourcedir.txt", "msitest\\sourcedir.txt", 1000); + create_file("msitest\\sourcedir.txt", 1000); create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -3957,7 +3496,7 @@ static void test_MsiProvideQualifiedComponentEx(void) lstrcatA( path, "\\msitest" ); CreateDirectoryA( path, NULL ); lstrcatA( path, "\\test.txt" ); - create_file( path, "test", 100 ); + create_file_data( path, "test", 100 ); res = RegSetValueExA( hkey5, prod_squashed, 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1 ); ok( res == ERROR_SUCCESS, "got %d\n", res ); @@ -4600,7 +4139,7 @@ static void test_MsiGetFileVersion(void) ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - create_file("ver.txt", "ver.txt", 20); + create_file("ver.txt", 20); /* file exists, no version information */ r = MsiGetFileVersionA("ver.txt", NULL, NULL, NULL, NULL); @@ -13543,7 +13082,7 @@ static void test_MsiGetFileSignatureInformation(void) hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len ); todo_wine ok(hr == CRYPT_E_FILE_ERROR, "expected CRYPT_E_FILE_ERROR got 0x%08x\n", hr); - create_file( "signature.bin", "signature", sizeof("signature") ); + create_file_data( "signature.bin", "signature", sizeof("signature") ); hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, NULL ); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); @@ -13901,9 +13440,9 @@ static void test_MsiConfigureProductEx(void) } CreateDirectoryA("msitest", NULL); - create_file("msitest\\hydrogen", "hydrogen", 500); - create_file("msitest\\helium", "helium", 500); - create_file("msitest\\lithium", "lithium", 500); + create_file_data("msitest\\hydrogen", "hydrogen", 500); + create_file_data("msitest\\helium", "helium", 500); + create_file_data("msitest\\lithium", "lithium", 500); create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table)); @@ -14444,7 +13983,7 @@ static void test_lastusedsource(void) } CreateDirectoryA("msitest", NULL); - create_file("maximus", "maximus", 500); + create_file("maximus", 500); create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); DeleteFileA("maximus"); @@ -14568,7 +14107,7 @@ static void test_setpropertyfolder(void) lstrcatA(path, "\\msitest\\added"); CreateDirectoryA("msitest", NULL); - create_file("msitest\\maximus", "msitest\\maximus", 500); + create_file("msitest\\maximus", 500); create_database(msifile, spf_tables, sizeof(spf_tables) / sizeof(msi_table)); @@ -14612,7 +14151,7 @@ static void test_sourcedir_props(void) } create_test_files(); - create_file("msitest\\sourcedir.txt", "msitest\\sourcedir.txt", 1000); + create_file("msitest\\sourcedir.txt", 1000); create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); @@ -14677,8 +14216,8 @@ static void test_concurrentinstall(void) CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest\\msitest", NULL); - create_file("msitest\\maximus", "msitest\\maximus", 500); - create_file("msitest\\msitest\\augustus", "msitest\\msitest\\augustus", 500); + create_file("msitest\\maximus", 500); + create_file("msitest\\msitest\\augustus", 500); create_database(msifile, ci_tables, sizeof(ci_tables) / sizeof(msi_table)); diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h new file mode 100644 index 0000000..f16e2d5 --- /dev/null +++ b/dlls/msi/tests/utils.h @@ -0,0 +1,60 @@ +/* + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +char PROG_FILES_DIR[MAX_PATH]; +char PROG_FILES_DIR_NATIVE[MAX_PATH]; +char COMMON_FILES_DIR[MAX_PATH]; +char APP_DATA_DIR[MAX_PATH]; +char WINDOWS_DIR[MAX_PATH]; +char CURR_DIR[MAX_PATH]; + +BOOL get_system_dirs(void); +BOOL get_user_dirs(void); + +typedef struct _msi_table +{ + const char *filename; + const char *data; + int size; +} msi_table; + +#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} + +/* in install.c */ +void create_database_wordcount(const char *name, const msi_table *tables, int num_tables, + int version, int wordcount, const char *template, const char *packagecode); + +#define create_database(name, tables, num_tables) \ + create_database_wordcount(name, tables, num_tables, 100, 0, ";1033", \ + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); + +#define create_database_template(name, tables, num_tables, version, template) \ + create_database_wordcount(name, tables, num_tables, version, 0, template, \ + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); + +void create_cab_file(const char *name, DWORD max_size, const char *files); +void create_file_data(const char *name, const char *data, DWORD size); +#define create_file(name, size) create_file_data(name, name, size) +void create_pf_data(const char *file, const char *data, BOOL is_file); +#define create_pf(file, is_file) create_pf_data(file, file, is_file) +void delete_cab_files(void); +BOOL delete_pf(const char *rel_path, BOOL is_file); +BOOL file_exists(const char *file); +BOOL pf_exists(const char *file); +BOOL is_process_limited(void); +UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query); -- 2.7.4

3 13

[PATCH] d3d11: Partially implement d3d11_immediate_context_UpdateSubresource1().
by Henri Verbeet 14 May '18

14 May '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 18fa670b333..e4d87603df8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2603,11 +2603,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface, - ID3D11Resource *resource, UINT subresource, const D3D11_BOX *box, const void *data, - UINT rowpitch, UINT depth_pitch, UINT flags) + ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, + UINT row_pitch, UINT depth_pitch, UINT flags) { - FIXME("iface %p, resource %p, subresource %u, box %p, data %p, rowpitch %u, depth_pitch %u, flags %#x stub!\n", - iface, resource, subresource, box, data, rowpitch, depth_pitch, flags); + TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", + iface, resource, subresource_idx, box, data, row_pitch, depth_pitch, flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + d3d11_immediate_context_UpdateSubresource(iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); } static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardResource(ID3D11DeviceContext1 *iface, -- 2.11.0

1 0