September 2009 - Wine-commits

Alexandre Julliard : advapi32/tests: Use explicit prototypes for function pointers.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 3afda68cc6e73f873e2e65115685085eef972913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3afda68cc6e73f873e2e65115… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 13:13:25 2009 +0200 advapi32/tests: Use explicit prototypes for function pointers. --- dlls/advapi32/tests/crypt_sha.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/tests/crypt_sha.c b/dlls/advapi32/tests/crypt_sha.c index 025f2cd..2737ee7 100644 --- a/dlls/advapi32/tests/crypt_sha.c +++ b/dlls/advapi32/tests/crypt_sha.c @@ -35,21 +35,22 @@ typedef struct { static void test_sha_ctx(void) { - FARPROC pA_SHAInit, pA_SHAUpdate, pA_SHAFinal; - static const char test_buffer[] = "In our Life there's If" - "In our beliefs there's Lie" - "In our business there is Sin" - "In our bodies, there is Die"; - ULONG test_buffer_size = strlen(test_buffer); + void (WINAPI *pA_SHAInit)(PSHA_CTX); + void (WINAPI *pA_SHAUpdate)(PSHA_CTX, const unsigned char *, UINT); + void (WINAPI *pA_SHAFinal)(PSHA_CTX, PULONG); + static const unsigned char test_buffer[] = "In our Life there's If" + "In our beliefs there's Lie" + "In our business there is Sin" + "In our bodies, there is Die"; HMODULE hmod; SHA_CTX ctx; ULONG result[5]; ULONG result_correct[5] = {0xe014f93, 0xe09791ec, 0x6dcf96c8, 0x8e9385fc, 0x1611c1bb}; hmod = GetModuleHandleA("advapi32.dll"); - pA_SHAInit = GetProcAddress(hmod, "A_SHAInit"); - pA_SHAUpdate = GetProcAddress(hmod, "A_SHAUpdate"); - pA_SHAFinal = GetProcAddress(hmod, "A_SHAFinal"); + pA_SHAInit = (void *)GetProcAddress(hmod, "A_SHAInit"); + pA_SHAUpdate = (void *)GetProcAddress(hmod, "A_SHAUpdate"); + pA_SHAFinal = (void *)GetProcAddress(hmod, "A_SHAFinal"); if (!pA_SHAInit || !pA_SHAUpdate || !pA_SHAFinal) { @@ -59,8 +60,8 @@ static void test_sha_ctx(void) RtlZeroMemory(&ctx, sizeof(ctx)); pA_SHAInit(&ctx); - pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); - pA_SHAUpdate(&ctx, test_buffer, test_buffer_size); + pA_SHAUpdate(&ctx, test_buffer, sizeof(test_buffer)-1); + pA_SHAUpdate(&ctx, test_buffer, sizeof(test_buffer)-1); pA_SHAFinal(&ctx, result); ok(!memcmp(result, result_correct, sizeof(result)), "incorrect result\n"); }

1 0

Alexandre Julliard : shell32: Use explicit prototypes for function pointers .
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 312429fb5147cc6507b299dc763178a40a1ae708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=312429fb5147cc6507b299dc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 13:13:19 2009 +0200 shell32: Use explicit prototypes for function pointers. --- dlls/shell32/shellord.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 44c9c7e..ac06e4b 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -180,7 +180,7 @@ BOOL WINAPI GetFileNameFromBrowse( LPCSTR lpstrTitle) { HMODULE hmodule; - FARPROC pGetOpenFileNameA; + BOOL (WINAPI *pGetOpenFileNameA)(LPOPENFILENAMEA); OPENFILENAMEA ofn; BOOL ret; @@ -190,7 +190,7 @@ BOOL WINAPI GetFileNameFromBrowse( hmodule = LoadLibraryA("comdlg32.dll"); if(!hmodule) return FALSE; - pGetOpenFileNameA = GetProcAddress(hmodule, "GetOpenFileNameA"); + pGetOpenFileNameA = (void *)GetProcAddress(hmodule, "GetOpenFileNameA"); if(!pGetOpenFileNameA) { FreeLibrary(hmodule);

1 0

Alexandre Julliard : mapi32: Use explicit prototypes for function pointers.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 34b0a55eb1c104ce7784fb13493091c092105253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b0a55eb1c104ce7784fb134… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 13:13:13 2009 +0200 mapi32: Use explicit prototypes for function pointers. --- dlls/mapi32/util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index b68eceb..c621a0f 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -858,8 +858,9 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path hmsi = LoadLibraryA("msi.dll"); if (hmsi) { - FARPROC pMsiProvideQualifiedComponentA = GetProcAddress(hmsi, "MsiProvideQualifiedComponentA"); + UINT (WINAPI *pMsiProvideQualifiedComponentA)(LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD); + pMsiProvideQualifiedComponentA = (void *)GetProcAddress(hmsi, "MsiProvideQualifiedComponentA"); if (pMsiProvideQualifiedComponentA) { static const char * const fmt[] = { "%d\\NT", "%d\\95", "%d" };

1 0

Alexandre Julliard : comctl32: Use explicit prototypes for function pointers.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: b7f2ccb6b456583226462e514a9af8847c8837b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f2ccb6b456583226462e514… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 13:13:08 2009 +0200 comctl32: Use explicit prototypes for function pointers. --- dlls/comctl32/comctl32undoc.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 194efe5..ee684c6 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -206,6 +206,10 @@ DWORD WINAPI GetSize (LPVOID lpMem) * - Free an MRU-list with FreeMRUList(). */ +typedef INT (CALLBACK *MRUStringCmpFnA)(LPCSTR lhs, LPCSTR rhs); +typedef INT (CALLBACK *MRUStringCmpFnW)(LPCWSTR lhs, LPCWSTR rhs); +typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length); + typedef struct tagCREATEMRULISTA { DWORD cbSize; @@ -213,7 +217,11 @@ typedef struct tagCREATEMRULISTA DWORD dwFlags; HKEY hKey; LPSTR lpszSubKey; - PROC lpfnCompare; + union + { + MRUStringCmpFnA string_cmpfn; + MRUBinaryCmpFn binary_cmpfn; + } u; } CREATEMRULISTA, *LPCREATEMRULISTA; typedef struct tagCREATEMRULISTW @@ -223,7 +231,11 @@ typedef struct tagCREATEMRULISTW DWORD dwFlags; HKEY hKey; LPWSTR lpszSubKey; - PROC lpfnCompare; + union + { + MRUStringCmpFnW string_cmpfn; + MRUBinaryCmpFn binary_cmpfn; + } u; } CREATEMRULISTW, *LPCREATEMRULISTW; /* dwFlags */ @@ -385,7 +397,7 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, UINT i; LPSTR dataA = NULL; - if (!mp || !mp->extview.lpfnCompare) + if (!mp || !mp->extview.u.string_cmpfn) return -1; if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) { @@ -397,13 +409,12 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, for(i=0; i<mp->cursize; i++) { if (mp->extview.dwFlags & MRUF_BINARY_LIST) { - if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart, - cbData)) + if (!mp->extview.u.binary_cmpfn(lpData, &mp->array[i]->datastart, cbData)) break; } else { if(mp->isUnicode) { - if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart)) + if (!mp->extview.u.string_cmpfn(lpData, (LPWSTR)&mp->array[i]->datastart)) break; } else { DWORD len = WideCharToMultiByte(CP_ACP, 0, @@ -414,7 +425,7 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&mp->array[i]->datastart, -1, itemA, len, NULL, NULL); - cmp = mp->extview.lpfnCompare(dataA, itemA); + cmp = mp->extview.u.string_cmpfn((LPWSTR)dataA, (LPWSTR)itemA); Free(itemA); if(!cmp) break; @@ -672,7 +683,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) ERR("(%u %u %x %p %s %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), - mp->extview.lpfnCompare, err); + mp->extview.u.string_cmpfn, err); return 0; } @@ -717,7 +728,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) TRACE("(%u %u %x %p %s %p): Current Size = %d\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), - mp->extview.lpfnCompare, mp->cursize); + mp->extview.u.string_cmpfn, mp->cursize); return mp; }

1 0

Alexandre Julliard : user32/tests: Use explicit prototypes for function pointers.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: b225082a71af13b3f3554c95989f839834975295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b225082a71af13b3f3554c959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 13:12:46 2009 +0200 user32/tests: Use explicit prototypes for function pointers. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 30acaa2..540b494 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11787,7 +11787,7 @@ static void test_PostMessage(void) START_TEST(msg) { BOOL ret; - FARPROC pIsWinEventHookInstalled = 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ + BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ init_procs();

1 0

Alexandre Julliard : user32: Use explicit prototypes for function pointers.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 13ca78cf1a2e0af740813e90a1905e9f480d4ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ca78cf1a2e0af740813e90a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 13:12:38 2009 +0200 user32: Use explicit prototypes for function pointers. --- dlls/user32/hook.c | 17 +++++++++-------- dlls/user32/nonclient.c | 4 +++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index ae4c5f1..916c37e 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -85,7 +85,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); struct hook_info { INT id; - FARPROC proc; + void *proc; void *handle; DWORD pid, tid; BOOL prev_unicode, next_unicode; @@ -844,24 +844,25 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id do { - if (info.proc) + WINEVENTPROC proc = info.proc; + if (proc) { TRACE( "calling WH_WINEVENT hook %p event %x hwnd %p %x %x module %s\n", - info.proc, event, hwnd, object_id, child_id, debugstr_w(info.module) ); + proc, event, hwnd, object_id, child_id, debugstr_w(info.module) ); - if (!info.module[0] || (info.proc = get_hook_proc( info.proc, info.module )) != NULL) + if (!info.module[0] || (proc = get_hook_proc( proc, info.module )) != NULL) { if (TRACE_ON(relay)) DPRINTF( "%04x:Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", - GetCurrentThreadId(), info.proc, info.handle, event, hwnd, object_id, + GetCurrentThreadId(), proc, info.handle, event, hwnd, object_id, child_id, GetCurrentThreadId(), GetCurrentTime()); - info.proc(info.handle, event, hwnd, object_id, child_id, - GetCurrentThreadId(), GetCurrentTime()); + proc( info.handle, event, hwnd, object_id, child_id, + GetCurrentThreadId(), GetCurrentTime()); if (TRACE_ON(relay)) DPRINTF( "%04x:Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", - GetCurrentThreadId(), info.proc, info.handle, event, hwnd, object_id, + GetCurrentThreadId(), proc, info.handle, event, hwnd, object_id, child_id, GetCurrentThreadId(), GetCurrentTime()); } } diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 3353126..03831a3 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1600,7 +1600,9 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) HMODULE hmodule = LoadLibraryA( "shell32.dll" ); if (hmodule) { - FARPROC aboutproc = GetProcAddress( hmodule, "ShellAboutA" ); + BOOL (WINAPI *aboutproc)(HWND, LPCSTR, LPCSTR, HICON); + + aboutproc = (void *)GetProcAddress( hmodule, "ShellAboutA" ); if (aboutproc) aboutproc( hwnd, PACKAGE_STRING, NULL, 0 ); FreeLibrary( hmodule ); }

1 0

Alexandre Julliard : kernel32: Use explicit prototypes for function pointers.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 858f08789e90e794ffff52f53f45180edba70061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858f08789e90e794ffff52f53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 13:12:28 2009 +0200 kernel32: Use explicit prototypes for function pointers. --- dlls/kernel32/comm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 0fbd7e3..f4edfd3 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1237,7 +1237,7 @@ BOOL WINAPI CommConfigDialogW( HWND hWnd, /* [in] parent window for the dialog */ LPCOMMCONFIG lpCommConfig) /* [out] pointer to struct to fill */ { - FARPROC pCommConfigDialog; + DWORD (WINAPI *pCommConfigDialog)(LPCWSTR, HWND, LPCOMMCONFIG); HMODULE hConfigModule; DWORD res = ERROR_INVALID_PARAMETER; @@ -1245,7 +1245,7 @@ BOOL WINAPI CommConfigDialogW( hConfigModule = LoadLibraryW(lpszSerialUI); if (hConfigModule) { - pCommConfigDialog = GetProcAddress(hConfigModule, "drvCommConfigDialogW"); + pCommConfigDialog = (void *)GetProcAddress(hConfigModule, "drvCommConfigDialogW"); if (pCommConfigDialog) { res = pCommConfigDialog(lpszDevice, hWnd, lpCommConfig); } @@ -1333,7 +1333,7 @@ BOOL WINAPI SetCommConfig( */ BOOL WINAPI SetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, DWORD dwSize) { - FARPROC lpfnSetDefaultCommConfig; + BOOL (WINAPI *lpfnSetDefaultCommConfig)(LPCWSTR, LPCOMMCONFIG, DWORD); HMODULE hConfigModule; BOOL r = FALSE; @@ -1343,7 +1343,7 @@ BOOL WINAPI SetDefaultCommConfigW(LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, if(!hConfigModule) return r; - lpfnSetDefaultCommConfig = GetProcAddress(hConfigModule, "drvSetDefaultCommConfigW"); + lpfnSetDefaultCommConfig = (void *)GetProcAddress(hConfigModule, "drvSetDefaultCommConfigW"); if (lpfnSetDefaultCommConfig) r = lpfnSetDefaultCommConfig(lpszDevice, lpCommConfig, dwSize); @@ -1398,7 +1398,7 @@ BOOL WINAPI GetDefaultCommConfigW( afterwards the number of bytes copied to the buffer or the needed size of the buffer. */ { - FARPROC pGetDefaultCommConfig; + DWORD (WINAPI *pGetDefaultCommConfig)(LPCWSTR, LPCOMMCONFIG, LPDWORD); HMODULE hConfigModule; DWORD res = ERROR_INVALID_PARAMETER; @@ -1406,7 +1406,7 @@ BOOL WINAPI GetDefaultCommConfigW( hConfigModule = LoadLibraryW(lpszSerialUI); if (hConfigModule) { - pGetDefaultCommConfig = GetProcAddress(hConfigModule, "drvGetDefaultCommConfigW"); + pGetDefaultCommConfig = (void *)GetProcAddress(hConfigModule, "drvGetDefaultCommConfigW"); if (pGetDefaultCommConfig) { res = pGetDefaultCommConfig(lpszName, lpCC, lpdwSize); }

1 0

Alexandre Julliard : include: Fix the RPC_AUTH_KEY_RETRIEVAL_FN definition.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: bea2e15cf32308ca3376337a1dafea8b3bd096a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea2e15cf32308ca3376337a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 12:27:09 2009 +0200 include: Fix the RPC_AUTH_KEY_RETRIEVAL_FN definition. --- include/rpcdce.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index f7bb44c..465a835 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -190,7 +190,7 @@ typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE 0x10 typedef RPC_STATUS RPC_ENTRY RPC_IF_CALLBACK_FN( RPC_IF_HANDLE InterfaceUuid, void *Context ); -typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(); +typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(void *, RPC_WSTR, ULONG, void **, RPC_STATUS *); typedef struct _RPC_POLICY {

1 0

Alexandre Julliard : msi: Force overwriting of read-only files when extracting a cabinet, with tests .
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: e98a52e58509529a364c9b12fb9a9b3b6265b1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98a52e58509529a364c9b12f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 12:19:28 2009 +0200 msi: Force overwriting of read-only files when extracting a cabinet, with tests. --- dlls/msi/media.c | 16 +++++++-- dlls/msi/tests/install.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 4 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 2de3252..7c9dc15 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -333,11 +333,19 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, NULL, CREATE_ALWAYS, attrs, NULL); if (handle == INVALID_HANDLE_VALUE) { - if (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) - ERR("failed to create %s (error %d)\n", - debugstr_w(path), GetLastError()); + DWORD err = GetLastError(); + DWORD attrs = GetFileAttributesW(path); - goto done; + if (attrs == INVALID_FILE_ATTRIBUTES) + ERR("failed to create %s (error %d)\n", debugstr_w(path), err); + else if (err == ERROR_ACCESS_DENIED && (attrs & FILE_ATTRIBUTE_READONLY)) + { + TRACE("removing read-only attribute on %s\n", debugstr_w(path)); + SetFileAttributesW( path, attrs & ~FILE_ATTRIBUTE_READONLY ); + handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); + } + else + WARN("failed to create %s (error %d)\n", debugstr_w(path), err); } done: diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0a54ea6..beb0630 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -381,6 +381,16 @@ static const CHAR rof_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\t "Media\tDiskId\n" "1\t1\t\t\tDISK1\t\n"; +static const CHAR rofc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1"; + +static const CHAR rofc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\ttest1.cab\tDISK1\t\n"; + static const CHAR sdp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" @@ -1078,6 +1088,18 @@ static const msi_table rof_tables[] = ADD_TABLE(property), }; +static const msi_table rofc_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rofc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rofc_media), + ADD_TABLE(property), +}; + static const msi_table sdp_tables[] = { ADD_TABLE(rof_component), @@ -2578,6 +2600,55 @@ static void test_readonlyfile(void) DeleteFile(msifile); } +static void test_readonlyfile_cab(void) +{ + UINT r; + DWORD size; + HANDLE file; + CHAR path[MAX_PATH]; + CHAR buf[16]; + + CreateDirectoryA("msitest", NULL); + create_file("maximus", 500); + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + DeleteFile("maximus"); + + create_database(msifile, rofc_tables, sizeof(rofc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\\msitest"); + CreateDirectory(path, NULL); + + lstrcat(path, "\\maximus"); + file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + + WriteFile(file, "readonlyfile", strlen("readonlyfile"), &size, NULL); + CloseHandle(file); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + memset( buf, 0, sizeof(buf) ); + if ((file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL)) != INVALID_HANDLE_VALUE) + { + ReadFile(file, buf, sizeof(buf) - 1, &size, NULL); + CloseHandle(file); + } + ok( !lstrcmp( buf, "maximus" ), "Expected file to be overwritten, got '%s'\n", buf ); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + /* Delete the files in the temp (current) folder */ + delete_cab_files(); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); + DeleteFile(msifile); +} + static void test_setdirproperty(void) { UINT r; @@ -6160,6 +6231,7 @@ START_TEST(install) test_samesequence(); test_uiLevelFlags(); test_readonlyfile(); + test_readonlyfile_cab(); test_setdirproperty(); test_cabisextracted(); test_concurrentinstall();

1 0

Alexandre Julliard : user32/tests: Non-US keyboards are allowed on Wine too .
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: bab99e535321bf804ed82c0b4fe463b0a2b3c95d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab99e535321bf804ed82c0b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 12:18:56 2009 +0200 user32/tests: Non-US keyboards are allowed on Wine too. --- dlls/user32/tests/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 548a5ad..42d9544 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -894,7 +894,7 @@ static void test_Input_blackbox(void) if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) { - win_skip("Skipping Input_blackbox test on non-US keyboard\n"); + skip("Skipping Input_blackbox test on non-US keyboard\n"); return; } window = CreateWindow("Static", NULL, WS_POPUP|WS_HSCROLL|WS_VSCROLL

1 0