December 2009 - Wine-Commits

Alexander Nicolaysen Sørnes : screenshot queue: Show whether a version has a maintainer
by Alexander Nicolaysen Sørnes Dec. 3, 2009

Dec. 3, 2009

Module: appdb Branch: master Commit: 561bf2b6b1a158e12cc6c975d6c51f700b932d66 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=561bf2b6b1a158e12cc6c975… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Thu Dec 3 21:53:13 2009 +0100 screenshot queue: Show whether a version has a maintainer --- include/appData.php | 6 +++++- include/application.php | 5 +++++ include/version.php | 5 +++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/appData.php b/include/appData.php index 91c0e58..198aca7 100644 --- a/include/appData.php +++ b/include/appData.php @@ -350,10 +350,11 @@ class appData function objectGetHeader($sType) { $oTableRow = new TableRow(); - $oTableRow->AddTextCell("Submission Date"); + $oTableRow->AddTextCell("Submission date"); $oTableRow->AddTextCell("Submitter"); $oTableRow->AddTextCell("Application"); $oTableRow->AddTextCell("Version"); + $oTableRow->AddTextCell('Has maintainer'); return $oTableRow; } @@ -562,11 +563,14 @@ class appData $oApp = new Application($this->iAppId); $oUser = new User($this->iSubmitterId); + $bMaintained = $this->iVersionId ? $oVersion->hasMaintainer() : $oApp->hasMaintainer(); + $oTableRow = new TableRow(); $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime))); $oTableRow->AddTextCell($oUser->objectMakeLink()); $oTableRow->AddTextCell($oApp->objectMakeLink()); $oTableRow->AddTextCell($this->iVersionId ? $oVersion->objectMakeLink() : "N/A"); + $oTableRow->AddTextCell($bMaintained ? 'YES' : 'No'); // create the object manager specific row $oOMTableRow = new OMTableRow($oTableRow); diff --git a/include/application.php b/include/application.php index 6f8fa26..b321cf4 100644 --- a/include/application.php +++ b/include/application.php @@ -244,6 +244,11 @@ class Application { return true; } + public function hasMaintainer() + { + return $this->bHasMaintainer; + } + public function updateMaintainerState() { $this->bHasMaintainer = maintainer::appHasMaintainer($this->iAppId); diff --git a/include/version.php b/include/version.php index a14a2c4..a66fd87 100644 --- a/include/version.php +++ b/include/version.php @@ -1547,6 +1547,11 @@ class version { $this->sState = $sState; } + public function hasMaintainer() + { + return $this->bHasMaintainer; + } + public function updateMaintainerState() { $this->bHasMaintainer = maintainer::versionHasMaintainer($this->iVersionId);

1 0

Jacek Caban : winetest: Remove no longer needed Gecko check.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: b07bc345155865092875491b82c3ddac3c13dfb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07bc345155865092875491b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 15:15:38 2009 +0100 winetest: Remove no longer needed Gecko check. --- programs/winetest/main.c | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 21dbaef..bb68ed1 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -175,21 +175,6 @@ static BOOL is_native_dll( HMODULE module ) return TRUE; } -/* check if Gecko is present, trying to trigger the install if not */ -static BOOL gecko_check(void) -{ - IHTMLDocument2 *doc; - IHTMLElement *body; - BOOL ret = FALSE; - - CoInitialize( NULL ); - if (FAILED( CoCreateInstance( &CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER, - &IID_IHTMLDocument2, (void **)&doc ))) return FALSE; - if ((ret = SUCCEEDED( IHTMLDocument2_get_body( doc, &body )))) IHTMLElement_Release( body ); - IHTMLDocument_Release( doc ); - return ret; -} - static void print_version (void) { #ifdef __i386__ @@ -693,12 +678,6 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, nr_native_dlls++; return TRUE; } - if (!strcmp( dllname, "mshtml" ) && running_under_wine() && !gecko_check()) - { - FreeLibrary(dll); - xprintf (" %s=load error Gecko is not installed\n", dllname); - return TRUE; - } FreeLibrary(dll); if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName )))

1 0

Jacek Caban : mshtml: Disable Gecko installation on unsupported CPU architectures.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 412f4a6091232a932d49a9bb7f4d00e84a578d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412f4a6091232a932d49a9bb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 15:08:30 2009 +0100 mshtml: Disable Gecko installation on unsupported CPU architectures. --- dlls/mshtml/install.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index cfe3cd0..4122194 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -47,7 +47,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-x86.cab" +#ifdef __i386__ +#define GECKO_ARCH "x86" +#else +#define GECKO_ARCH "" +#endif + +#define GECKO_FILE_NAME "wine_gecko-" GECKO_VERSION "-" GECKO_ARCH ".cab" static const WCHAR mshtml_keyW[] = {'S','o','f','t','w','a','r','e', @@ -430,7 +436,8 @@ static LPWSTR get_url(void) static const WCHAR wszGeckoUrl[] = {'G','e','c','k','o','U','r','l',0}; static const WCHAR httpW[] = {'h','t','t','p'}; - static const WCHAR v_formatW[] = {'?','a','r','c','h','=','x','8','6','&','v','=',0}; + static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; + static const WCHAR v_formatW[] = {'&','v','='}; /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ res = RegOpenKeyW(HKEY_CURRENT_USER, mshtml_keyW, &hkey); @@ -448,8 +455,15 @@ static LPWSTR get_url(void) } if(returned_size > sizeof(httpW) && !memcmp(url, httpW, sizeof(httpW))) { - strcatW(url, v_formatW); - MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+strlenW(url), size/sizeof(WCHAR)-strlenW(url)); + DWORD len; + + len = strlenW(url); + memcpy(url+len, arch_formatW, sizeof(arch_formatW)); + len += sizeof(arch_formatW)/sizeof(WCHAR); + len += MultiByteToWideChar(CP_ACP, 0, GECKO_ARCH, sizeof(GECKO_ARCH), url+len, size/sizeof(WCHAR)-len)-1; + memcpy(url+len, v_formatW, sizeof(v_formatW)); + len += sizeof(v_formatW)/sizeof(WCHAR); + MultiByteToWideChar(CP_ACP, 0, GECKO_VERSION, -1, url+len, size/sizeof(WCHAR)-len); } TRACE("Got URL %s\n", debugstr_w(url)); @@ -512,6 +526,9 @@ BOOL install_wine_gecko(BOOL silent) { HANDLE hsem; + if(!*GECKO_ARCH) + return FALSE; + SetLastError(ERROR_SUCCESS); hsem = CreateSemaphoreA( NULL, 0, 1, "mshtml_install_semaphore");

1 0

Jacek Caban : wininet: Directly return error status from HTTP_HandleRedirect.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: a9ecdc6024c2e5011b7973a68c0b506896aca39c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ecdc6024c2e5011b7973a68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 14:49:56 2009 +0100 wininet: Directly return error status from HTTP_HandleRedirect. --- dlls/wininet/http.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0aa78b5..19a34cb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -208,7 +208,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *req, DWORD index); static LPWSTR HTTP_build_req( LPCWSTR *list, int len ); static BOOL HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD); static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl); -static BOOL HTTP_HandleRedirect(http_request_t *req, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); static BOOL HTTP_VerifyValidHeader(http_request_t *req, LPCWSTR field); static void HTTP_DrainContent(http_request_t *req); @@ -3132,7 +3131,7 @@ static LPWSTR HTTP_GetRedirectURL(http_request_t *lpwhr, LPCWSTR lpszUrl) /*********************************************************************** * HTTP_HandleRedirect (internal) */ -static BOOL HTTP_HandleRedirect(http_request_t *lpwhr, LPCWSTR lpszUrl) +static DWORD HTTP_HandleRedirect(http_request_t *lpwhr, LPCWSTR lpszUrl) { http_session_t *lpwhs = lpwhr->lpHttpSession; appinfo_t *hIC = lpwhs->lpAppInfo; @@ -3170,7 +3169,7 @@ static BOOL HTTP_HandleRedirect(http_request_t *lpwhr, LPCWSTR lpszUrl) urlComponents.lpszExtraInfo = NULL; urlComponents.dwExtraInfoLength = 0; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) - return FALSE; + return INTERNET_GetLastError(); if (!strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) && (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) @@ -3244,15 +3243,13 @@ static BOOL HTTP_HandleRedirect(http_request_t *lpwhr, LPCWSTR lpszUrl) lpwhs->nServerPort = urlComponents.nPort; NETCON_close(&lpwhr->netConnection); - if ((res = HTTP_ResolveName(lpwhr)) != ERROR_SUCCESS) { - INTERNET_SetLastError(res); - return FALSE; - } + if ((res = HTTP_ResolveName(lpwhr)) != ERROR_SUCCESS) + return res; + res = NETCON_init(&lpwhr->netConnection, lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE); - if (res != ERROR_SUCCESS) { - INTERNET_SetLastError(res); - return FALSE; - } + if (res != ERROR_SUCCESS) + return res; + lpwhr->read_pos = lpwhr->read_size = 0; lpwhr->read_chunked = FALSE; } @@ -3289,7 +3286,7 @@ static BOOL HTTP_HandleRedirect(http_request_t *lpwhr, LPCWSTR lpszUrl) if (0 <= index) HTTP_DeleteCustomHeader(lpwhr, index); - return TRUE; + return ERROR_SUCCESS; } /*********************************************************************** @@ -3571,16 +3568,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, HTTP_DrainContent(lpwhr); if ((new_url = HTTP_GetRedirectURL( lpwhr, szNewLocation ))) { - BOOL bSuccess; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REDIRECT, new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); - bSuccess = HTTP_HandleRedirect(lpwhr, new_url); - if (bSuccess) + res = HTTP_HandleRedirect(lpwhr, new_url); + if (res == ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, requestString); loop_next = TRUE; - }else { - res = INTERNET_GetLastError(); } HeapFree( GetProcessHeap(), 0, new_url ); } @@ -3741,14 +3735,11 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PT HTTP_DrainContent(lpwhr); if ((new_url = HTTP_GetRedirectURL( lpwhr, szNewLocation ))) { - BOOL rc; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REDIRECT, new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); - rc = HTTP_HandleRedirect(lpwhr, new_url); - if (rc) + res = HTTP_HandleRedirect(lpwhr, new_url); + if (res == ERROR_SUCCESS) res = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE); - else - res = INTERNET_GetLastError(); HeapFree( GetProcessHeap(), 0, new_url ); } }

1 0

Jacek Caban : wininet: Directly return error status fro HTTP_HttpEndRequest .
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 741b6611fbd6fbbe876490ebc03ae982edcdb6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741b6611fbd6fbbe876490ebc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 14:49:29 2009 +0100 wininet: Directly return error status fro HTTP_HttpEndRequest. --- dlls/wininet/http.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ccdb6d1..0aa78b5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3701,20 +3701,19 @@ static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) } -static BOOL HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR dwContext) +static DWORD HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR dwContext) { - BOOL rc = FALSE; INT responseLen; DWORD dwBufferSize; INTERNET_ASYNC_RESULT iar; - DWORD res; + DWORD res = ERROR_SUCCESS; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE); - if (responseLen) - rc = TRUE; + if (!responseLen) + res = ERROR_HTTP_HEADER_NOT_FOUND; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, sizeof(DWORD)); @@ -3742,16 +3741,14 @@ static BOOL HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR HTTP_DrainContent(lpwhr); if ((new_url = HTTP_GetRedirectURL( lpwhr, szNewLocation ))) { + BOOL rc; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REDIRECT, new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); rc = HTTP_HandleRedirect(lpwhr, new_url); - if (rc) { + if (rc) res = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE); - if(res != ERROR_SUCCESS) { - rc = FALSE; - INTERNET_SetLastError(res); - } - } + else + res = INTERNET_GetLastError(); HeapFree( GetProcessHeap(), 0, new_url ); } } @@ -3759,12 +3756,12 @@ static BOOL HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR } iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; - iar.dwError = rc ? 0 : INTERNET_GetLastError(); + iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_REQUEST_COMPLETE, &iar, sizeof(INTERNET_ASYNC_RESULT)); - return rc; + return res; } /*********************************************************************** @@ -3814,14 +3811,14 @@ static void AsyncHttpEndRequestProc(WORKREQUEST *work) BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, LPINTERNET_BUFFERSW lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext) { - BOOL rc = FALSE; http_request_t *lpwhr; + DWORD res; TRACE("-->\n"); if (lpBuffersOut) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -3829,7 +3826,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); if (lpwhr) WININET_Release( &lpwhr->hdr ); return FALSE; @@ -3849,14 +3846,16 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, request->dwContext = dwContext; INTERNET_AsyncCall(&work); - INTERNET_SetLastError(ERROR_IO_PENDING); + res = ERROR_IO_PENDING; } else - rc = HTTP_HttpEndRequestW(lpwhr, dwFlags, dwContext); + res = HTTP_HttpEndRequestW(lpwhr, dwFlags, dwContext); WININET_Release( &lpwhr->hdr ); - TRACE("%i <--\n",rc); - return rc; + TRACE("%u <--\n", res); + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } /***********************************************************************

1 0

Huw Davies : d3d9/tests: Destroy the window after we release the device.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 14b343fcd006adb6f310cc747663f50dc24b91f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b343fcd006adb6f310cc747… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 3 13:28:15 2009 +0000 d3d9/tests: Destroy the window after we release the device. Although either order is supposed to work, the former crashes with Wine. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 18a69c6..15ddd44 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10748,9 +10748,9 @@ cleanup: IDirect3DDevice9_GetSwapChain(device_ptr, 0, &swapchain); IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters); - DestroyWindow(present_parameters.hDeviceWindow); IDirect3DSwapChain9_Release(swapchain); ref = IDirect3DDevice9_Release(device_ptr); ok(ref == 0, "The device was not properly freed: refcount %u\n", ref); + DestroyWindow(present_parameters.hDeviceWindow); } }

1 0

Paul Vriens : shell32/tests: Don't fill a string with potential garbage.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 1c582d2ac5ba213889fcef938cdcb4c25d367437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c582d2ac5ba213889fcef938… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 3 13:33:36 2009 +0100 shell32/tests: Don't fill a string with potential garbage. --- dlls/shell32/tests/progman_dde.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index c3cb1e7..7e6c874 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -120,6 +120,14 @@ static void init_strings(void) LONG res; /* Older Win9x and NT4 */ + RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); + size = sizeof(Programs); + RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&Programs, &size); + size = sizeof(startup); + RegQueryValueExA(key, "Startup", NULL, NULL, (LPBYTE)&startup, &size); + lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); + RegCloseKey(key); + RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); size = sizeof(CommonPrograms); res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&CommonPrograms, &size); @@ -129,14 +137,6 @@ static void init_strings(void) /* Win9x */ lstrcpyA(CommonPrograms, Programs); } - - RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(Programs); - RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&Programs, &size); - size = sizeof(startup); - RegQueryValueExA(key, "Startup", NULL, NULL, (LPBYTE)&startup, &size); - lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); - RegCloseKey(key); } memset(&cs, 0, sizeof(cs));

1 0

Nikolay Sivov : comctl32/updown: Set width to default value on creation.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: eaee84f4dbf086fe185532a59f879690fec5a5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaee84f4dbf086fe185532a59… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 13:38:27 2009 +0300 comctl32/updown: Set width to default value on creation. --- dlls/comctl32/tests/updown.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/updown.c | 15 +++++++++--- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index c0e381f..236706d 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -559,6 +559,7 @@ static void test_updown_create(void) { CHAR text[MAX_PATH]; HWND updown; + RECT r; flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -574,6 +575,55 @@ static void test_updown_create(void) ok_sequence(sequences, EDIT_SEQ_INDEX, get_edit_text_seq, "get edit text", FALSE); DestroyWindow(updown); + + /* create with zero width */ + updown = CreateWindowA (UPDOWN_CLASSA, 0, WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 0, 0, + parent_wnd, (HMENU)(DWORD_PTR)1, GetModuleHandleA(NULL), 0); + ok(updown != NULL, "Failed to create updown control\n"); + r.right = 0; + GetClientRect(updown, &r); + ok(r.right > 0, "Expected default width, got %d\n", r.right); + DestroyWindow(updown); + /* create with really small width */ + updown = CreateWindowA (UPDOWN_CLASSA, 0, WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 2, 0, + parent_wnd, (HMENU)(DWORD_PTR)1, GetModuleHandleA(NULL), 0); + ok(updown != NULL, "Failed to create updown control\n"); + r.right = 0; + GetClientRect(updown, &r); + ok(r.right != 2 && r.right > 0, "Expected default width, got %d\n", r.right); + DestroyWindow(updown); + /* create with width greater than default */ + updown = CreateWindowA (UPDOWN_CLASSA, 0, WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 100, 0, + parent_wnd, (HMENU)(DWORD_PTR)1, GetModuleHandleA(NULL), 0); + ok(updown != NULL, "Failed to create updown control\n"); + r.right = 0; + GetClientRect(updown, &r); + ok(r.right < 100 && r.right > 0, "Expected default width, got %d\n", r.right); + DestroyWindow(updown); + /* create with zero height, UDS_HORZ */ + updown = CreateWindowA (UPDOWN_CLASSA, 0, UDS_HORZ | WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 0, 0, + parent_wnd, (HMENU)(DWORD_PTR)1, GetModuleHandleA(NULL), 0); + ok(updown != NULL, "Failed to create updown control\n"); + r.bottom = 0; + GetClientRect(updown, &r); + ok(r.bottom == 0, "Expected zero height, got %d\n", r.bottom); + DestroyWindow(updown); + /* create with really small height, UDS_HORZ */ + updown = CreateWindowA (UPDOWN_CLASSA, 0, UDS_HORZ | WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 0, 2, + parent_wnd, (HMENU)(DWORD_PTR)1, GetModuleHandleA(NULL), 0); + ok(updown != NULL, "Failed to create updown control\n"); + r.bottom = 0; + GetClientRect(updown, &r); + ok(r.bottom == 0, "Expected zero height, got %d\n", r.bottom); + DestroyWindow(updown); + /* create with height greater than default, UDS_HORZ */ + updown = CreateWindowA (UPDOWN_CLASSA, 0, UDS_HORZ | WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 0, 100, + parent_wnd, (HMENU)(DWORD_PTR)1, GetModuleHandleA(NULL), 0); + ok(updown != NULL, "Failed to create updown control\n"); + r.bottom = 0; + GetClientRect(updown, &r); + ok(r.bottom < 100 && r.bottom > 0, "Expected default height, got %d\n", r.bottom); + DestroyWindow(updown); } static void test_UDS_SETBUDDYINT(void) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 773d359..f6b240a 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -71,7 +71,7 @@ typedef struct #define AUTOPRESS_DELAY 250 /* time to keep arrow pressed on KEY_DOWN */ #define REPEAT_DELAY 50 /* delay between auto-increments */ -#define DEFAULT_WIDTH 14 /* default width of the ctrl */ +#define DEFAULT_WIDTH 16 /* default width of the ctrl */ #define DEFAULT_XSEP 0 /* default separation between buddy and ctrl */ #define DEFAULT_ADDTOP 0 /* amount to extend above the buddy window */ #define DEFAULT_ADDBOT 0 /* amount to extend below the buddy window */ @@ -200,7 +200,7 @@ static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, int arr /* now figure out if we need a space away from the buddy */ if (IsWindow(infoPtr->Buddy) ) { if (infoPtr->dwStyle & UDS_ALIGNLEFT) rect->right -= spacer; - else rect->left += spacer; + else if (infoPtr->dwStyle & UDS_ALIGNRIGHT) rect->left += spacer; } /* @@ -854,13 +854,16 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L switch(message) { case WM_CREATE: + { + CREATESTRUCTW *pcs = (CREATESTRUCTW*)lParam; + infoPtr = Alloc (sizeof(UPDOWN_INFO)); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); /* initialize the info struct */ infoPtr->Self = hwnd; - infoPtr->Notify = ((LPCREATESTRUCTW)lParam)->hwndParent; - infoPtr->dwStyle = ((LPCREATESTRUCTW)lParam)->style; + infoPtr->Notify = pcs->hwndParent; + infoPtr->dwStyle = pcs->style; infoPtr->AccelCount = 0; infoPtr->AccelVect = 0; infoPtr->AccelIndex = -1; @@ -872,6 +875,9 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L infoPtr->Flags = (infoPtr->dwStyle & UDS_SETBUDDYINT) ? FLAG_BUDDYINT : 0; SetWindowLongW (hwnd, GWL_STYLE, infoPtr->dwStyle & ~WS_BORDER); + if (!(infoPtr->dwStyle & UDS_HORZ)) + SetWindowPos (hwnd, NULL, 0, 0, DEFAULT_WIDTH, pcs->cy, + SWP_NOOWNERZORDER | SWP_NOMOVE); /* Do we pick the buddy win ourselves? */ if (infoPtr->dwStyle & UDS_AUTOBUDDY) @@ -880,6 +886,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L OpenThemeData (hwnd, themeClass); TRACE("UpDown Ctrl creation, hwnd=%p\n", hwnd); + } break; case WM_DESTROY:

1 0

Jacek Caban : wininet: Remove a few more INTERNET_SetLastError calls.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 903d9c460d812211c4675027439b0f4ff56619da URL: http://source.winehq.org/git/wine.git/?a=commit;h=903d9c460d812211c46750274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 14:47:43 2009 +0100 wininet: Remove a few more INTERNET_SetLastError calls. --- dlls/wininet/internet.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c13f44a..8a3340c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -321,7 +321,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI InternetInitializeAutoProxyDll(DWORD dwReserved) { FIXME("STUB\n"); - INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -338,7 +338,7 @@ BOOL WINAPI DetectAutoProxyUrl(LPSTR lpszAutoProxyUrl, DWORD dwAutoProxyUrlLength, DWORD dwDetectFlags) { FIXME("STUB\n"); - INTERNET_SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -2920,7 +2920,7 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, /* gopher doesn't seem to be implemented in wine, but it's supposed * to be supported by InternetOpenUrlA. */ default: - INTERNET_SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); + SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); break; } @@ -2965,13 +2965,13 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, if (!lpszUrl) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); goto lend; } hIC = (appinfo_t*)WININET_GetObject( hInternet ); if (NULL == hIC || hIC->hdr.htype != WH_HINIT) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } @@ -2992,7 +2992,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, /* * This is from windows. */ - INTERNET_SetLastError(ERROR_IO_PENDING); + SetLastError(ERROR_IO_PENDING); } else { ret = INTERNET_InternetOpenUrlW(hIC, lpszUrl, lpszHeaders, dwHeadersLength, dwFlags, dwContext); } @@ -3266,7 +3266,7 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, hdr = WININET_GetObject( hFile ); if (!hdr) { - INTERNET_SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -3604,7 +3604,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags, if (!lpUrlComponents || lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }

1 0

Nikolay Sivov : comctl32/updown: Specify all styles explicitly in tests.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: b2d89f4823924b27b0894379268ee9bca00a2ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d89f4823924b27b08943792… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 3 11:01:45 2009 +0300 comctl32/updown: Specify all styles explicitly in tests. --- dlls/comctl32/tests/updown.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 85452ae..c0e381f 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -287,7 +287,7 @@ static HWND create_updown_control(DWORD style) RECT rect; GetClientRect(parent_wnd, &rect); - updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE | UDS_ALIGNRIGHT | style, + updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE | style, 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), edit, 100, 0, 50); if (!updown) return NULL; @@ -304,7 +304,7 @@ static void test_updown_pos(void) HWND updown; int r; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -365,7 +365,7 @@ static void test_updown_pos32(void) int r; int low, high; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -437,7 +437,7 @@ static void test_updown_buddy(void) { HWND updown, buddyReturn; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -462,7 +462,7 @@ static void test_updown_base(void) int r; CHAR text[10]; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -499,7 +499,7 @@ static void test_updown_base(void) DestroyWindow(updown); /* switch base with buddy attached */ - updown = create_updown_control(UDS_SETBUDDYINT); + updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT); r = SendMessage(updown, UDM_SETPOS, 0, 10); expect(50, r); @@ -523,7 +523,7 @@ static void test_updown_unicode(void) HWND updown; int r; - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -562,7 +562,7 @@ static void test_updown_create(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); ok(updown != NULL, "Failed to create updown control\n"); ok_sequence(sequences, PARENT_SEQ_INDEX, add_updown_to_parent_seq, "add updown control to parent", TRUE); ok_sequence(sequences, EDIT_SEQ_INDEX, add_updown_with_edit_seq, "add updown control with edit", FALSE); @@ -587,7 +587,7 @@ static void test_UDS_SETBUDDYINT(void) SetWindowTextA(edit, text); /* creating without UDS_SETBUDDYINT */ - updown = create_updown_control(0); + updown = create_updown_control(UDS_ALIGNRIGHT); /* try to set UDS_SETBUDDYINT after creation */ style = GetWindowLongA(updown, GWL_STYLE); SetWindowLongA(updown, GWL_STYLE, style | UDS_SETBUDDYINT); @@ -599,7 +599,7 @@ static void test_UDS_SETBUDDYINT(void) DestroyWindow(updown); /* creating with UDS_SETBUDDYINT */ - updown = create_updown_control(UDS_SETBUDDYINT); + updown = create_updown_control(UDS_SETBUDDYINT | UDS_ALIGNRIGHT); GetWindowTextA(edit, text, sizeof(text)/sizeof(CHAR)); /* 50 is initial value here */ ok(lstrcmpA(text, "50") == 0, "Expected '50', got '%s'\n", text);

1 0