June 2006 - Wine-commits - list.winehq.org

Andrew Talbot : wininet/tests: Write-strings warnings fix.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: cf371a1ef849acca0af8c616fa8d24b01f754e09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf371a1ef849acca0af8c61… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jun 20 22:37:27 2006 +0100 wininet/tests: Write-strings warnings fix. --- dlls/wininet/tests/url.c | 100 +++++++++++++++++++++++++++------------------- 1 files changed, 59 insertions(+), 41 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 4afefbd..56e38f1 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -330,21 +330,28 @@ static void InternetCrackUrlW_test(void) static void fill_url_components(LPURL_COMPONENTS lpUrlComponents) { - lpUrlComponents->dwStructSize = sizeof(URL_COMPONENTS); - lpUrlComponents->lpszScheme = "http"; - lpUrlComponents->dwSchemeLength = strlen(lpUrlComponents->lpszScheme); - lpUrlComponents->nScheme = INTERNET_SCHEME_HTTP; - lpUrlComponents->lpszHostName = "www.winehq.org"; - lpUrlComponents->dwHostNameLength = strlen(lpUrlComponents->lpszHostName); - lpUrlComponents->nPort = 80; - lpUrlComponents->lpszUserName = "username"; - lpUrlComponents->dwUserNameLength = strlen(lpUrlComponents->lpszUserName); - lpUrlComponents->lpszPassword = "password"; - lpUrlComponents->dwPasswordLength = strlen(lpUrlComponents->lpszPassword); - lpUrlComponents->lpszUrlPath = "/site/about"; - lpUrlComponents->dwUrlPathLength = strlen(lpUrlComponents->lpszUrlPath); - lpUrlComponents->lpszExtraInfo = ""; - lpUrlComponents->dwExtraInfoLength = strlen(lpUrlComponents->lpszExtraInfo); + static CHAR http[] = "http", + winehq[] = "www.winehq.org", + username[] = "username", + password[] = "password", + site_about[] = "/site/about", + empty[] = ""; + + lpUrlComponents->dwStructSize = sizeof(URL_COMPONENTS); + lpUrlComponents->lpszScheme = http; + lpUrlComponents->dwSchemeLength = strlen(lpUrlComponents->lpszScheme); + lpUrlComponents->nScheme = INTERNET_SCHEME_HTTP; + lpUrlComponents->lpszHostName = winehq; + lpUrlComponents->dwHostNameLength = strlen(lpUrlComponents->lpszHostName); + lpUrlComponents->nPort = 80; + lpUrlComponents->lpszUserName = username; + lpUrlComponents->dwUserNameLength = strlen(lpUrlComponents->lpszUserName); + lpUrlComponents->lpszPassword = password; + lpUrlComponents->dwPasswordLength = strlen(lpUrlComponents->lpszPassword); + lpUrlComponents->lpszUrlPath = site_about; + lpUrlComponents->dwUrlPathLength = strlen(lpUrlComponents->lpszUrlPath); + lpUrlComponents->lpszExtraInfo = empty; + lpUrlComponents->dwExtraInfoLength = strlen(lpUrlComponents->lpszExtraInfo); } static void InternetCreateUrlA_test(void) @@ -353,6 +360,17 @@ static void InternetCreateUrlA_test(void LPSTR szUrl; DWORD len = -1; BOOL ret; + static CHAR empty[] = "", + nhttp[] = "nhttp", + http[] = "http", + https[] = "https", + winehq[] = "www.winehq.org", + username[] = "username", + password[] = "password", + site_about[] = "/site/about", + about[] = "about", + blank[] = "blank", + host[] = "host"; /* test NULL lpUrlComponents */ ret = InternetCreateUrlA(NULL, 0, NULL, &len); @@ -462,7 +480,7 @@ static void InternetCreateUrlA_test(void /* valid username, empty password */ fill_url_components(&urlComp); SetLastError(0xdeadbeef); - urlComp.lpszPassword = ""; + urlComp.lpszPassword = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); @@ -490,7 +508,7 @@ static void InternetCreateUrlA_test(void */ fill_url_components(&urlComp); SetLastError(0xdeadbeef); - urlComp.lpszUserName = ""; + urlComp.lpszUserName = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); @@ -515,8 +533,8 @@ static void InternetCreateUrlA_test(void /* empty username, empty password */ fill_url_components(&urlComp); SetLastError(0xdeadbeef); - urlComp.lpszUserName = ""; - urlComp.lpszPassword = ""; + urlComp.lpszUserName = empty; + urlComp.lpszPassword = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); @@ -530,7 +548,7 @@ static void InternetCreateUrlA_test(void */ fill_url_components(&urlComp); HeapFree(GetProcessHeap(), 0, szUrl); - urlComp.lpszScheme = "nhttp"; + urlComp.lpszScheme = nhttp; urlComp.dwSchemeLength = strlen(urlComp.lpszScheme); len = strlen(CREATE_URL6) + 1; szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, len); @@ -541,7 +559,7 @@ static void InternetCreateUrlA_test(void /* if lpszScheme != "http" or nPort != 80, display nPort */ HeapFree(GetProcessHeap(), 0, szUrl); - urlComp.lpszScheme = "http"; + urlComp.lpszScheme = http; urlComp.dwSchemeLength = strlen(urlComp.lpszScheme); urlComp.nPort = 42; szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); @@ -555,19 +573,19 @@ static void InternetCreateUrlA_test(void memset(&urlComp, 0, sizeof(urlComp)); urlComp.dwStructSize = sizeof(URL_COMPONENTS); - urlComp.lpszScheme = "http"; + urlComp.lpszScheme = http; urlComp.dwSchemeLength = 0; urlComp.nScheme = INTERNET_SCHEME_HTTP; - urlComp.lpszHostName = "www.winehq.org"; + urlComp.lpszHostName = winehq; urlComp.dwHostNameLength = 0; urlComp.nPort = 80; - urlComp.lpszUserName = "username"; + urlComp.lpszUserName = username; urlComp.dwUserNameLength = 0; - urlComp.lpszPassword = "password"; + urlComp.lpszPassword = password; urlComp.dwPasswordLength = 0; - urlComp.lpszUrlPath = "/site/about"; + urlComp.lpszUrlPath = site_about; urlComp.dwUrlPathLength = 0; - urlComp.lpszExtraInfo = ""; + urlComp.lpszExtraInfo = empty; urlComp.dwExtraInfoLength = 0; len = strlen(CREATE_URL1); szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); @@ -578,19 +596,19 @@ static void InternetCreateUrlA_test(void memset(&urlComp, 0, sizeof(urlComp)); urlComp.dwStructSize = sizeof(URL_COMPONENTS); - urlComp.lpszScheme = "https"; + urlComp.lpszScheme = https; urlComp.dwSchemeLength = 0; urlComp.nScheme = INTERNET_SCHEME_HTTP; - urlComp.lpszHostName = "www.winehq.org"; + urlComp.lpszHostName = winehq; urlComp.dwHostNameLength = 0; urlComp.nPort = 443; - urlComp.lpszUserName = "username"; + urlComp.lpszUserName = username; urlComp.dwUserNameLength = 0; - urlComp.lpszPassword = "password"; + urlComp.lpszPassword = password; urlComp.dwPasswordLength = 0; - urlComp.lpszUrlPath = "/site/about"; + urlComp.lpszUrlPath = site_about; urlComp.dwUrlPathLength = 0; - urlComp.lpszExtraInfo = ""; + urlComp.lpszExtraInfo = empty; urlComp.dwExtraInfoLength = 0; len = strlen(CREATE_URL8); szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); @@ -603,9 +621,9 @@ static void InternetCreateUrlA_test(void memset(&urlComp, 0, sizeof(urlComp)); urlComp.dwStructSize = sizeof(URL_COMPONENTS); - urlComp.lpszScheme = "about"; + urlComp.lpszScheme = about; urlComp.dwSchemeLength = 5; - urlComp.lpszUrlPath = "blank"; + urlComp.lpszUrlPath = blank; urlComp.dwUrlPathLength = 5; len = strlen(CREATE_URL9); len++; /* work around bug in native wininet */ @@ -619,9 +637,9 @@ static void InternetCreateUrlA_test(void memset(&urlComp, 0, sizeof(urlComp)); urlComp.dwStructSize = sizeof(URL_COMPONENTS); - urlComp.lpszScheme = "about"; - urlComp.lpszHostName = "host"; - urlComp.lpszUrlPath = "blank"; + urlComp.lpszScheme = about; + urlComp.lpszHostName = host; + urlComp.lpszUrlPath = blank; len = strlen(CREATE_URL10); len++; /* work around bug in native wininet */ szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); @@ -635,7 +653,7 @@ static void InternetCreateUrlA_test(void memset(&urlComp, 0, sizeof(urlComp)); urlComp.dwStructSize = sizeof(URL_COMPONENTS); urlComp.nPort = 8080; - urlComp.lpszScheme = "about"; + urlComp.lpszScheme = about; len = strlen(CREATE_URL11); szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); @@ -647,10 +665,10 @@ static void InternetCreateUrlA_test(void memset(&urlComp, 0, sizeof(urlComp)); urlComp.dwStructSize = sizeof(URL_COMPONENTS); - urlComp.lpszScheme = "http"; + urlComp.lpszScheme = http; urlComp.dwSchemeLength = 0; urlComp.nScheme = INTERNET_SCHEME_HTTP; - urlComp.lpszHostName = "www.winehq.org"; + urlComp.lpszHostName = winehq; urlComp.dwHostNameLength = 0; urlComp.nPort = 65535; len = strlen(CREATE_URL12);

1 0

Dmitry Timoshkov : winex11.drv: Add support for full screen window state using the NETWM protocol.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: ef72c1d1002c4f9af0c9d85dee32c40144e27d2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef72c1d1002c4f9af0c9d85… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 20 02:25:54 2006 +0900 winex11.drv: Add support for full screen window state using the NETWM protocol. --- dlls/winex11.drv/winpos.c | 51 +++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 4 ++- dlls/winex11.drv/x11drv_main.c | 4 ++- 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 07b4005..80626b4 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -79,6 +79,9 @@ #define _NET_WM_MOVERESIZE_MOVE #define _NET_WM_MOVERESIZE_SIZE_KEYBOARD 9 /* size via keyboard */ #define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 /* move via keyboard */ +#define _NET_WM_STATE_REMOVE 0 +#define _NET_WM_STATE_ADD 1 +#define _NET_WM_STATE_TOGGLE 2 /*********************************************************************** * X11DRV_Expose @@ -521,6 +524,49 @@ void X11DRV_SetWindowStyle( HWND hwnd, D /*********************************************************************** + * update_fullscreen_state + * + * Use the NETWM protocol to set the fullscreen state. + * This only works for mapped windows. + */ +static void update_fullscreen_state( Display *display, struct x11drv_win_data *data, + const RECT *old_client_rect ) +{ + XEvent xev; + BOOL old_fs_state = FALSE, new_fs_state = FALSE; + + if (old_client_rect->left <= 0 && old_client_rect->right >= screen_width && + old_client_rect->top <= 0 && old_client_rect->bottom >= screen_height) + old_fs_state = TRUE; + + if (data->client_rect.left <= 0 && data->client_rect.right >= screen_width && + data->client_rect.top <= 0 && data->client_rect.bottom >= screen_height) + new_fs_state = TRUE; + + if (new_fs_state == old_fs_state) return; + + TRACE("setting fullscreen state for hwnd %p to %s\n", data->hwnd, new_fs_state ? "true" : "false"); + + if (data->whole_window) + { + xev.xclient.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[0] = new_fs_state ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; + xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_FULLSCREEN); + xev.xclient.data.l[2] = 0; + wine_tsx11_lock(); + XSendEvent(display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); + wine_tsx11_unlock(); + } +} + + +/*********************************************************************** * X11DRV_set_window_pos * * Set a window position and Z order. @@ -529,7 +575,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H const RECT *rectClient, UINT swp_flags, const RECT *valid_rects ) { struct x11drv_win_data *data; - RECT new_whole_rect; + RECT new_whole_rect, old_client_rect; WND *win; DWORD old_style, new_style; BOOL ret; @@ -539,6 +585,8 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H new_whole_rect = *rectWindow; X11DRV_window_to_X_rect( data, &new_whole_rect ); + old_client_rect = data->client_rect; + if (!IsRectEmpty( &valid_rects[0] )) { int x_offset = 0, y_offset = 0; @@ -671,6 +719,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H XMapWindow( display, data->whole_window ); wine_tsx11_unlock(); } + update_fullscreen_state( display, data, &old_client_rect ); } } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7cfdbc4..adbb1f7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -566,9 +566,11 @@ enum x11drv_atoms XATOM__MOTIF_WM_HINTS, XATOM__KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR, XATOM__NET_WM_MOVERESIZE, + XATOM__NET_WM_NAME, XATOM__NET_WM_PID, XATOM__NET_WM_PING, - XATOM__NET_WM_NAME, + XATOM__NET_WM_STATE, + XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_WINDOW_TYPE, XATOM__NET_WM_WINDOW_TYPE_UTILITY, XATOM_XdndAware, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 5655e60..51a6ac4 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -128,9 +128,11 @@ static const char * const atom_names[NB_ "_MOTIF_WM_HINTS", "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", "_NET_WM_MOVERESIZE", + "_NET_WM_NAME", "_NET_WM_PID", "_NET_WM_PING", - "_NET_WM_NAME", + "_NET_WM_STATE", + "_NET_WM_STATE_FULLSCREEN", "_NET_WM_WINDOW_TYPE", "_NET_WM_WINDOW_TYPE_UTILITY", "XdndAware",

1 0

James Hawkins : advpack: Implement DoInfInstall on top of the install framework.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 1a0208ef612708c7dd8e570760758d7da2405f9c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a0208ef612708c7dd8e570… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 20 14:31:01 2006 -0700 advpack: Implement DoInfInstall on top of the install framework. --- dlls/advpack/install.c | 69 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 20441cf..edfc663 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -460,6 +460,41 @@ typedef struct LPCSTR section_name; } SETUPCOMMAND_PARAMS; +typedef struct +{ + HWND hwnd; + LPCWSTR title; + LPCWSTR inf_name; + LPCWSTR dir; + LPCWSTR section_name; +} SETUPCOMMAND_PARAMSW; + +/* internal: see DoInfInstall */ +static HRESULT DoInfInstallW(const SETUPCOMMAND_PARAMSW *setup) +{ + ADVInfo info; + HRESULT hr; + + TRACE("(%p)\n", setup); + + ZeroMemory(&info, sizeof(ADVInfo)); + + hr = install_init(setup->inf_name, setup->section_name, setup->dir, 0, &info); + if (hr != S_OK) + goto done; + + hr = spapi_install(&info); + if (hr != S_OK) + goto done; + + hr = adv_install(&info); + +done: + install_release(&info); + + return S_OK; +} + /*********************************************************************** * DoInfInstall (ADVPACK.@) * @@ -474,24 +509,32 @@ typedef struct */ HRESULT WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup) { - BOOL ret; - HINF hinf; - void *callback_context; + UNICODE_STRING title, inf, section, dir; + SETUPCOMMAND_PARAMSW params; + HRESULT hr; - TRACE("(%p)\n", setup); + if (!setup) + return E_INVALIDARG; - hinf = SetupOpenInfFileA(setup->inf_name, NULL, INF_STYLE_WIN4, NULL); - if (hinf == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); + RtlCreateUnicodeStringFromAsciiz(&title, setup->title); + RtlCreateUnicodeStringFromAsciiz(&inf, setup->inf_name); + RtlCreateUnicodeStringFromAsciiz(&section, setup->section_name); + RtlCreateUnicodeStringFromAsciiz(&dir, setup->dir); - callback_context = SetupInitDefaultQueueCallback(setup->hwnd); + params.title = title.Buffer; + params.inf_name = inf.Buffer; + params.section_name = section.Buffer; + params.dir = dir.Buffer; + params.hwnd = setup->hwnd; - ret = SetupInstallFromInfSectionA(NULL, hinf, setup->section_name, SPINST_ALL, - NULL, NULL, 0, SetupDefaultQueueCallbackA, - callback_context, NULL, NULL); - SetupTermDefaultQueueCallback(callback_context); - SetupCloseInfFile(hinf); + hr = DoInfInstallW(&params); - return ret ? S_OK : HRESULT_FROM_WIN32(GetLastError()); + RtlFreeUnicodeString(&title); + RtlFreeUnicodeString(&inf); + RtlFreeUnicodeString(&section); + RtlFreeUnicodeString(&dir); + + return hr; } /***********************************************************************

1 0

Saulius Krasuckas : lz32: Small test fixes.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 0f6cb8860feadcb35d76a5dc247ca1911a9b492c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f6cb8860feadcb35d76a5d… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Wed Jun 21 01:01:22 2006 +0300 lz32: Small test fixes. --- dlls/lz32/tests/lzexpand_main.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 38240b3..05704ce 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -274,19 +274,21 @@ static void test_LZOpenFileW(void) ok(retval > 0, "GetCurrentDirectoryW returned %ld, GLE=0x%lx\n", retval, GetLastError()); lstrcatA(expected, "\\"); - /* We probably should use WideCharToMultiByte() on filenameW here: */ + /* It's probably better to use WideCharToMultiByte() on filenameW: */ lstrcatA(expected, filename); /* Compressed file name ends with underscore. */ retval = lstrlenA(expected); expected[retval-1] = '_'; + memset(&test, 0xA5, sizeof(test)); /* Try to open compressed file. */ file = LZOpenFileW(filenameW, &test, OF_EXIST); ok(file >= 0, "LZOpenFileW failed on switching to a compressed file name\n"); ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileW set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == 0, "LZOpenFileW set test.nErrCode to %d\n", + ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileW set test.nErrCode to %d\n", test.nErrCode); + /* Note that W-function returns A-string by a OFSTRUCT.szPathName: */ ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileW returned '%s', but was expected to return '%s'\n", test.szPathName, expected); @@ -294,12 +296,12 @@ static void test_LZOpenFileW(void) /* Delete the file then make sure it doesn't exist anymore. */ file = LZOpenFileW(filename_W, &test, OF_DELETE); - ok(file >= 0, "LZOpenFileA failed on delete\n"); + ok(file >= 0, "LZOpenFileW failed on delete\n"); LZClose(file); retval = GetFileAttributesW(filename_W); ok(retval == INVALID_FILE_ATTRIBUTES, - "GetFileAttributesA succeeded on deleted file\n"); + "GetFileAttributesW succeeded on deleted file\n"); }

1 0

Saulius Krasuckas : kernel: Check for an exe which is always present in a system dir.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: f1c3191b2c6643feceb494f2fa744d21eee5037f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1c3191b2c6643feceb494f… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Wed Jun 21 01:05:15 2006 +0300 kernel: Check for an exe which is always present in a system dir. --- dlls/kernel/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index 81528d3..ccf9a75 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1448,7 +1448,7 @@ static void test_OpenFile_exists(void) HFILE hFile; OFSTRUCT ofs; - static const char *file = "\\winver.exe"; + static const char *file = "\\regsvr32.exe"; char buff[MAX_PATH]; UINT length; @@ -1456,7 +1456,7 @@ static void test_OpenFile_exists(void) if ((length + lstrlen(file) < MAX_PATH)) { - lstrcat(buff, file); + lstrcatA(buff, file); hFile = OpenFile(buff, &ofs, OF_EXIST); ok( hFile == TRUE, "%s not found : %ld\n", buff, GetLastError());

1 0

Saulius Krasuckas : kernel: Add tests for OpenFile.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 0012f56a611f71b016157994f305a70eb98b260a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0012f56a611f71b01615799… Author: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Date: Wed Jun 21 01:05:26 2006 +0300 kernel: Add tests for OpenFile. --- dlls/kernel/tests/file.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index ccf9a75..a0e8181 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1443,15 +1443,18 @@ static void test_read_write(void) ok( ret, "DeleteFileA: error %ld\n", GetLastError()); } -static void test_OpenFile_exists(void) +static void test_OpenFile(void) { HFILE hFile; OFSTRUCT ofs; + BOOL ret; + DWORD retval; static const char *file = "\\regsvr32.exe"; char buff[MAX_PATH]; UINT length; + /* Check for existing file */ length = GetSystemDirectoryA(buff, MAX_PATH); if ((length + lstrlen(file) < MAX_PATH)) @@ -1462,8 +1465,45 @@ static void test_OpenFile_exists(void) ok( hFile == TRUE, "%s not found : %ld\n", buff, GetLastError()); } + /* Check for nonexistent file */ + SetLastError(0xfaceabee); hFile = OpenFile(".\\foo-bar-foo.baz", &ofs, OF_EXIST); ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %ld\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() returns %ld\n", GetLastError() ); + + /* Create an empty file */ + hFile = OpenFile(filename, &ofs, OF_CREATE); + ok( hFile != HFILE_ERROR, "OpenFile failed to create nonexistent file\n" ); + ret = CloseHandle((HANDLE)hFile); + ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + retval = GetFileAttributesA(filename); + ok( retval != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA: error %ld\n", GetLastError() ); + + /* Check various opening options */ + hFile = OpenFile(filename, &ofs, OF_READ); + ok( hFile != HFILE_ERROR, "OpenFile failed on read\n" ); + ret = CloseHandle((HANDLE)hFile); + ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + + hFile = OpenFile(filename, &ofs, OF_WRITE); + ok( hFile != HFILE_ERROR, "OpenFile failed on write\n" ); + ret = CloseHandle((HANDLE)hFile); + ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + + hFile = OpenFile(filename, &ofs, OF_READWRITE); + ok( hFile != HFILE_ERROR, "OpenFile failed on read/write\n" ); + ret = CloseHandle((HANDLE)hFile); + ok( ret == TRUE, "CloseHandle() returns %d\n", ret ); + + hFile = OpenFile(filename, &ofs, OF_EXIST); + ok( hFile == 1, "OpenFile failed on finding our created file\n" ); + + /* Delete the file and make sure it doesn't exist anymore */ + hFile = OpenFile(filename, &ofs, OF_DELETE); + ok( hFile == 1, "OpenFile failed on delete (%d)\n", hFile ); + + retval = GetFileAttributesA(filename); + ok( retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file\n" ); } static void test_overlapped(void) @@ -1552,6 +1592,6 @@ START_TEST(file) test_GetFileType(); test_async_file_errors(); test_read_write(); - test_OpenFile_exists(); + test_OpenFile(); test_overlapped(); }

1 0

Mikołaj Zalewski : shell32: Fix the nBufferMax param of LoadStringW calls from SHELL_ConfirmDialogW.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 5de24f03209768dad79150b9d262df0d84eb7560 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5de24f03209768dad79150b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jun 20 21:58:20 2006 +0200 shell32: Fix the nBufferMax param of LoadStringW calls from SHELL_ConfirmDialogW. --- dlls/shell32/shlfileop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 5b650e7..b5e2e74 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -103,8 +103,8 @@ BOOL SHELL_ConfirmDialogW(int nKindOfDia if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; - LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)); - LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)); + LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)&szDir);

1 0

Detlef Riekenberg : winedump: Add DLL_WINE_PREATTACH to the generated DllMain.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: dbdb8e2ea19e58a73b2a9874483f889046bfdce0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbdb8e2ea19e58a73b2a987… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 20 23:30:39 2006 +0200 winedump: Add DLL_WINE_PREATTACH to the generated DllMain. --- tools/winedump/output.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 5a2f4ef..198f7e8 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -231,6 +231,8 @@ void output_c_preamble (void) "BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID " "lpvReserved)\n{\n\tTRACE(\"(0x%%p, %%ld, %%p)\\n\",hinstDLL," "fdwReason,lpvReserved);\n\n\t" + "if (fdwReason == DLL_WINE_PREATTACH) return FALSE;\t" + "/* prefer native version */\n\n\t" "if (fdwReason == DLL_PROCESS_ATTACH)\n\t{\n\t\t"); if (globals.forward_dll)

1 0

Detlef Riekenberg : compstui: Add minimal compstui.dll (stubs only).
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 5640b56ebd4178915d535c0bd4fdb14c594637a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5640b56ebd4178915d535c0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 20 06:12:36 2006 +0200 compstui: Add minimal compstui.dll (stubs only). --- configure | 3 + configure.ac | 1 dlls/Makefile.in | 5 ++ dlls/compstui/.gitignore | 2 + dlls/compstui/Makefile.in | 14 ++++++ dlls/compstui/compstui.spec | 4 ++ dlls/compstui/compstui_main.c | 96 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 124 insertions(+), 1 deletions(-) create mode 100644 dlls/compstui/.gitignore create mode 100644 dlls/compstui/Makefile.in create mode 100644 dlls/compstui/compstui.spec create mode 100644 dlls/compstui/compstui_main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5640b56ebd4178915d5…

1 0

Detlef Riekenberg : winedump: Use ntdll as template.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 52404421ba8705ee8ec5b8f58f57ac3f551cba07 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52404421ba8705ee8ec5b8f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 20 23:28:14 2006 +0200 winedump: Use ntdll as template. --- tools/winedump/output.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 0f88a19..5a2f4ef 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -483,7 +483,7 @@ void output_install_script (void) "cp Makefile.in $1/dlls/%s/Makefile.in\n" "echo Copied DLL files\n\n" "cd $1\n\n" - "sed '/dlls\\/x11drv\\/Makefile/" + "sed '/dlls\\/ntdll\\/Makefile/" "{G;s/$/dlls\\/%s\\/Makefile/;}' configure.ac >t.tmp\n" "mv -f t.tmp configure.ac\n" "echo Patched configure.ac\n\n"

1 0