wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Henri Verbeet : d3d9/tests: Add a test for window styles on device creation .
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: d2479406e877ec19b334f6be7ec90a38e356b410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2479406e877ec19b334f6be7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 3 22:30:16 2011 +0200 d3d9/tests: Add a test for window styles on device creation. --- dlls/d3d9/tests/device.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 55b6982..39f84d7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2889,6 +2889,80 @@ done: #endif } +static void test_window_style(void) +{ + RECT focus_rect, fullscreen_rect, r; + LONG device_style, device_exstyle; + LONG focus_style, focus_exstyle; + LONG style, expected_style; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG ref; + + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, screen_width / 2, screen_height / 2, 0, 0, 0, 0); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + device_exstyle = GetWindowLongA(device_window, GWL_EXSTYLE); + focus_style = GetWindowLongA(focus_window, GWL_STYLE); + focus_exstyle = GetWindowLongA(focus_window, GWL_EXSTYLE); + + SetRect(&fullscreen_rect, 0, 0, screen_width, screen_height); + GetWindowRect(focus_window, &focus_rect); + + device = create_device(d3d9, device_window, focus_window, FALSE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + GetWindowRect(device_window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(device_window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + GetWindowRect(focus_window, &r); + ok(EqualRect(&r, &focus_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, + r.left, r.top, r.right, r.bottom); + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D9_Release(d3d9); + + DestroyWindow(device_window); + DestroyWindow(focus_window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -2939,6 +3013,7 @@ START_TEST(device) test_scissor_size(); test_wndproc(); test_wndproc_windowed(); + test_window_style(); } out:

1 0

Jacek Caban : mshtml: Don't use Gecko nsIURI::GetHostPort implementation.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 42ce560e380ae510199123bcc2d599f0ca6aa546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ce560e380ae510199123bcc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 21:55:05 2011 +0000 mshtml: Don't use Gecko nsIURI::GetHostPort implementation. --- dlls/mshtml/nsio.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 76c485c..b97dbe4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1878,9 +1878,6 @@ static nsresult NSAPI nsURI_GetHostPort(nsIURL *iface, nsACString *aHostPort) TRACE("(%p)->(%p)\n", This, aHostPort); - if(This->nsuri) - return nsIURI_GetHostPort(This->nsuri, aHostPort); - if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED;

1 0

Jacek Caban : urlmon: Moved test_internet_feature_defaults invokation to skip tests on too old IEs .
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 4815e411d17c478eb019fa5158267efb7d47f1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4815e411d17c478eb019fa515… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 21:15:23 2011 +0000 urlmon: Moved test_internet_feature_defaults invokation to skip tests on too old IEs. --- dlls/urlmon/tests/misc.c | 108 +++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 54 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index fa5bc6d..e4dc200 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1477,6 +1477,59 @@ static void test_IsValidURL(void) IBindCtx_Release(bctx); } +static const struct { + INTERNETFEATURELIST feature; + DWORD get_flags; + HRESULT expected; + BOOL todo; +} default_feature_tests[] = { + {FEATURE_OBJECT_CACHING,GET_FEATURE_FROM_PROCESS,S_OK}, + {FEATURE_ZONE_ELEVATION,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_MIME_HANDLING,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_MIME_SNIFFING,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_WINDOW_RESTRICTIONS,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_WEBOC_POPUPMANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_BEHAVIORS,GET_FEATURE_FROM_PROCESS,S_OK}, + {FEATURE_DISABLE_MK_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_OK}, + {FEATURE_LOCALMACHINE_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_SECURITYBAND,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_RESTRICT_ACTIVEXINSTALL,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_VALIDATE_NAVIGATE_URL,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_RESTRICT_FILEDOWNLOAD,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_ADDON_MANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_PROTOCOL_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_HTTP_USERNAME_PASSWORD_DISABLE,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_SAFE_BINDTOOBJECT,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_UNC_SAVEDFILECHECK,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_GET_URL_DOM_FILEPATH_UNENCODED,GET_FEATURE_FROM_PROCESS,S_OK}, + {FEATURE_TABBED_BROWSING,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_SSLUX,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_DISABLE_NAVIGATION_SOUNDS,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_DISABLE_LEGACY_COMPRESSION,GET_FEATURE_FROM_PROCESS,S_OK}, + {FEATURE_FORCE_ADDR_AND_STATUS,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_XMLHTTP,GET_FEATURE_FROM_PROCESS,S_OK}, + {FEATURE_DISABLE_TELNET_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_FEEDS,GET_FEATURE_FROM_PROCESS,S_FALSE}, + {FEATURE_BLOCK_INPUT_PROMPTS,GET_FEATURE_FROM_PROCESS,S_FALSE} +}; + +static void test_internet_feature_defaults(void) { + HRESULT hres; + DWORD i; + + for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { + hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); + if(default_feature_tests[i].todo) { + todo_wine + ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, default_feature_tests[i].expected, i); + } else { + ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, default_feature_tests[i].expected, i); + } + } +} + /* With older versions of IE (IE 7 and earlier), urlmon caches * the FeatureControl values from the registry when it's loaded * into memory. Newer versions of IE conditionally cache the @@ -1577,66 +1630,13 @@ static void test_internet_features_registry(void) { hres = pCoInternetSetFeatureEnabled(FEATURE_ZONE_ELEVATION, SET_FEATURE_ON_PROCESS, FALSE); ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); -} -static const struct { - INTERNETFEATURELIST feature; - DWORD get_flags; - HRESULT expected; - BOOL todo; -} default_feature_tests[] = { - {FEATURE_OBJECT_CACHING,GET_FEATURE_FROM_PROCESS,S_OK}, - {FEATURE_ZONE_ELEVATION,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_MIME_HANDLING,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_MIME_SNIFFING,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_WINDOW_RESTRICTIONS,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_WEBOC_POPUPMANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_BEHAVIORS,GET_FEATURE_FROM_PROCESS,S_OK}, - {FEATURE_DISABLE_MK_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_OK}, - {FEATURE_LOCALMACHINE_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_SECURITYBAND,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_RESTRICT_ACTIVEXINSTALL,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_VALIDATE_NAVIGATE_URL,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_RESTRICT_FILEDOWNLOAD,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_ADDON_MANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_PROTOCOL_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_HTTP_USERNAME_PASSWORD_DISABLE,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_SAFE_BINDTOOBJECT,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_UNC_SAVEDFILECHECK,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_GET_URL_DOM_FILEPATH_UNENCODED,GET_FEATURE_FROM_PROCESS,S_OK}, - {FEATURE_TABBED_BROWSING,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_SSLUX,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_DISABLE_NAVIGATION_SOUNDS,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_DISABLE_LEGACY_COMPRESSION,GET_FEATURE_FROM_PROCESS,S_OK}, - {FEATURE_FORCE_ADDR_AND_STATUS,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_XMLHTTP,GET_FEATURE_FROM_PROCESS,S_OK}, - {FEATURE_DISABLE_TELNET_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_FEEDS,GET_FEATURE_FROM_PROCESS,S_FALSE}, - {FEATURE_BLOCK_INPUT_PROMPTS,GET_FEATURE_FROM_PROCESS,S_FALSE} -}; - -static void test_internet_feature_defaults(void) { - HRESULT hres; - DWORD i; - - for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { - hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); - if(default_feature_tests[i].todo) { - todo_wine - ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, default_feature_tests[i].expected, i); - } else { - ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, default_feature_tests[i].expected, i); - } - } + test_internet_feature_defaults(); } static void test_CoInternetIsFeatureEnabled(void) { HRESULT hres; - test_internet_feature_defaults(); - hres = pCoInternetIsFeatureEnabled(FEATURE_ENTRY_COUNT, GET_FEATURE_FROM_PROCESS); ok(hres == E_FAIL, "CoInternetIsFeatureEnabled returned %08x, expected E_FAIL\n", hres); }

1 0

Jacek Caban : kernel32: Moved EnumProcesses implementation to kernel32.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 1fa36c85bd2e5b76f0ea3a577d4d527221e6c88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa36c85bd2e5b76f0ea3a577… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 21:08:42 2011 +0000 kernel32: Moved EnumProcesses implementation to kernel32. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 44 ++++++++++++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 2 +- dlls/psapi/psapi_main.c | 49 ------------------------------------------- 4 files changed, 46 insertions(+), 50 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 946bce0..aae17e9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -770,6 +770,7 @@ @ stdcall K32EmptyWorkingSet(long) @ stdcall K32GetProcessImageFileNameA(long ptr long) @ stdcall K32GetProcessImageFileNameW(long ptr long) +@ stdcall K32EnumProcesses(ptr long ptr) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog @ stdcall -i386 -private -register K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog @ stdcall LCIDToLocaleName(long ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d1d6a3b..668230d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3458,6 +3458,50 @@ DWORD WINAPI K32GetProcessImageFileNameW( HANDLE process, LPWSTR file, DWORD siz } /*********************************************************************** + * K32EnumProcesses (KERNEL32.@) + */ +BOOL WINAPI K32EnumProcesses(DWORD *lpdwProcessIDs, DWORD cb, DWORD *lpcbUsed) +{ + SYSTEM_PROCESS_INFORMATION *spi; + ULONG size = 0x4000; + void *buf = NULL; + NTSTATUS status; + + do { + size *= 2; + HeapFree(GetProcessHeap(), 0, buf); + buf = HeapAlloc(GetProcessHeap(), 0, size); + if (!buf) + return FALSE; + + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, NULL); + } while(status == STATUS_INFO_LENGTH_MISMATCH); + + if (status != STATUS_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, buf); + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + + spi = buf; + + for (*lpcbUsed = 0; cb >= sizeof(DWORD); cb -= sizeof(DWORD)) + { + *lpdwProcessIDs++ = HandleToUlong(spi->UniqueProcessId); + *lpcbUsed += sizeof(DWORD); + + if (spi->NextEntryOffset == 0) + break; + + spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset); + } + + HeapFree(GetProcessHeap(), 0, buf); + return TRUE; +} + +/*********************************************************************** * ProcessIdToSessionId (KERNEL32.@) * This function is available on Terminal Server 4SP4 and Windows 2000 */ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 25e39cc..f3c960c 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -3,7 +3,7 @@ @ stdcall EnumPageFilesA(ptr ptr) @ stdcall EnumPageFilesW(ptr ptr) @ stdcall EnumProcessModules(long ptr long ptr) -@ stdcall EnumProcesses(ptr long ptr) +@ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses @ stdcall GetDeviceDriverBaseNameA(ptr ptr long) @ stdcall GetDeviceDriverBaseNameW(ptr ptr long) @ stdcall GetDeviceDriverFileNameA(ptr ptr long) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 07863ea..7e05601 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -179,55 +179,6 @@ BOOL WINAPI EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID context ) } /*********************************************************************** - * EnumProcesses (PSAPI.@) - */ -BOOL WINAPI EnumProcesses(DWORD *lpdwProcessIDs, DWORD cb, DWORD *lpcbUsed) -{ - SYSTEM_PROCESS_INFORMATION *spi; - NTSTATUS status; - PVOID pBuf = NULL; - ULONG nAlloc = 0x8000; - - do { - if (pBuf != NULL) - { - HeapFree(GetProcessHeap(), 0, pBuf); - nAlloc *= 2; - } - - pBuf = HeapAlloc(GetProcessHeap(), 0, nAlloc); - if (pBuf == NULL) - return FALSE; - - status = NtQuerySystemInformation(SystemProcessInformation, pBuf, - nAlloc, NULL); - } while (status == STATUS_INFO_LENGTH_MISMATCH); - - if (status != STATUS_SUCCESS) - { - HeapFree(GetProcessHeap(), 0, pBuf); - SetLastError(RtlNtStatusToDosError(status)); - return FALSE; - } - - spi = pBuf; - - for (*lpcbUsed = 0; cb >= sizeof(DWORD); cb -= sizeof(DWORD)) - { - *lpdwProcessIDs++ = HandleToUlong(spi->UniqueProcessId); - *lpcbUsed += sizeof(DWORD); - - if (spi->NextEntryOffset == 0) - break; - - spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset); - } - - HeapFree(GetProcessHeap(), 0, pBuf); - return TRUE; -} - -/*********************************************************************** * EnumProcessModules (PSAPI.@) * * NOTES

1 0

Alexandre Julliard : atl: Only return a window procedure in AtlModuleRegisterWndClassInfoA/ W when subclassing.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: a4d0d6348958cf3563e3e8604bfcaa825f9d14b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d0d6348958cf3563e3e8604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 20:52:24 2011 +0200 atl: Only return a window procedure in AtlModuleRegisterWndClassInfoA/W when subclassing. --- dlls/atl/atl_main.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 8db4311..78ef7ce 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -464,6 +464,9 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA TRACE("wci->m_wc.lpszClassName = %s\n", wci->m_wc.lpszClassName); + if (wci->m_lpszOrigName) + FIXME( "subclassing %s not implemented\n", debugstr_a(wci->m_lpszOrigName)); + if (!wci->m_wc.lpszClassName) { snprintf(wci->m_szAutoName, sizeof(wci->m_szAutoName), "ATL%08lx", (UINT_PTR)wci); @@ -482,7 +485,8 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA wci->pWndProc = wci->m_wc.lpfnWndProc; wci->m_atom = atom; } - *pProc = wci->pWndProc; + + if (wci->m_lpszOrigName) *pProc = wci->pWndProc; TRACE("returning 0x%04x\n", atom); return atom; @@ -519,6 +523,9 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW TRACE("wci->m_wc.lpszClassName = %s\n", debugstr_w(wci->m_wc.lpszClassName)); + if (wci->m_lpszOrigName) + FIXME( "subclassing %s not implemented\n", debugstr_w(wci->m_lpszOrigName)); + if (!wci->m_wc.lpszClassName) { static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; @@ -538,7 +545,8 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW wci->pWndProc = wci->m_wc.lpfnWndProc; wci->m_atom = atom; } - *pProc = wci->pWndProc; + + if (wci->m_lpszOrigName) *pProc = wci->pWndProc; TRACE("returning 0x%04x\n", atom); return atom;

1 0

Jeremy Newman : fix js path when loading dynamically
by Jeremy Newman 04 May '11

04 May '11

Module: website Branch: master Commit: 4afc4844146653d9225967e2a08204790cd1f4f9 URL: http://source.winehq.org/git/website.git/?a=commit;h=4afc4844146653d9225967… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 4 10:50:52 2011 -0500 fix js path when loading dynamically --- include/html.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/html.php b/include/html.php index f71e047..71214d4 100644 --- a/include/html.php +++ b/include/html.php @@ -1419,11 +1419,11 @@ class html { // in ajax mode, add the js link inline $js = ""; - $js_file = "{$this->_file_root}/js/{$match[1][$i]}.js"; + $js_file = "{$this->_file_root}/{$match[1][$i]}.js"; if (file_exists($js_file)) { $mtime = filemtime($js_file); - $js = "<script src=\"{$this->_web_root}/js/{$match[1][$i]}.js?v={$mtime}\" type=\"text/javascript\"></script>\n"; + $js = "<script src=\"{$this->_web_root}/{$match[1][$i]}.js?v={$mtime}\" type=\"text/javascript\"></script>\n"; unset($mtime); } $in = str_replace('', $js, $in);

1 0

Jeremy Newman : cleanup
by Jeremy Newman 04 May '11

04 May '11

Module: website Branch: master Commit: c550c67d98040fd18cd7db90ad6d27e2aa18eb20 URL: http://source.winehq.org/git/website.git/?a=commit;h=c550c67d98040fd18cd7db… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 4 10:49:45 2011 -0500 cleanup --- utils.js | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/utils.js b/utils.js index 90e6ecb..1d20f17 100644 --- a/utils.js +++ b/utils.js @@ -2,7 +2,9 @@ Misc JavaScipt for WineHQ */ -// global document operations +/* + * global document operations + */ $(document).ready(function() { // fix PNG images for IE6

1 0

Jeremy Newman : copyright
by Jeremy Newman 04 May '11

04 May '11

Module: website Branch: master Commit: 95ef55b12c82117d2643f9920592ab19ec1f06b5 URL: http://source.winehq.org/git/website.git/?a=commit;h=95ef55b12c82117d2643f9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 4 10:49:35 2011 -0500 copyright --- .../en/global/themes/winehq/content_nobox.template | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/templates/en/global/themes/winehq/content_nobox.template b/templates/en/global/themes/winehq/content_nobox.template index be1983b..7303d08 100644 --- a/templates/en/global/themes/winehq/content_nobox.template +++ b/templates/en/global/themes/winehq/content_nobox.template @@ -3,6 +3,7 @@ <head> <title>{$page_title}</title> <meta name="SearchTitle" content="{$page_title}"> + <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org All rights reserved"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> {$meta_keywords}

1 0

Jeremy Newman : validation fixes
by Jeremy Newman 04 May '11

04 May '11

Module: website Branch: master Commit: 4c6023fa2248feb29539082c2012d4305e7af27d URL: http://source.winehq.org/git/website.git/?a=commit;h=4c6023fa2248feb2953908… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 4 10:48:56 2011 -0500 validation fixes --- news/en/2010112601.xml | 6 +++--- news/en/2010120301.xml | 6 +++--- news/en/2010121001.xml | 6 +++--- news/en/2010122401.xml | 6 +++--- news/en/2011010701.xml | 6 +++--- news/en/2011012101.xml | 6 +++--- news/en/2011020401.xml | 6 +++--- news/en/2011021801.xml | 6 +++--- news/en/2011030401.xml | 6 +++--- news/en/2011031801.xml | 6 +++--- news/en/2011040101.xml | 6 +++--- news/en/2011040801.xml | 6 +++--- news/en/2011041501.xml | 6 +++--- news/en/2011042901.xml | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=4c6023fa2248feb295…

1 0

Jeremy Newman : moved meta desc, and keywords into the template
by Jeremy Newman 04 May '11

04 May '11

Module: website Branch: master Commit: 8cd509534b436f0cc0de982601fdf453e8bfd3c4 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cd509534b436f0cc0de98… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed May 4 10:48:31 2011 -0500 moved meta desc, and keywords into the template --- templates/de/home.template | 2 ++ templates/en/home.template | 2 ++ templates/es/home.template | 2 ++ templates/fr/home.template | 2 ++ templates/he/home.template | 2 ++ templates/pl/home.template | 2 ++ 6 files changed, 12 insertions(+), 0 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index 912950c..636f194 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -1,5 +1,7 @@   + +  <div id="main_left"> diff --git a/templates/en/home.template b/templates/en/home.template index d75d1ea..f397d91 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -1,5 +1,7 @@   + +  <div id="main_left"> diff --git a/templates/es/home.template b/templates/es/home.template index 94d59fa..b725fa2 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -1,5 +1,7 @@   + +  <div id="main_left"> diff --git a/templates/fr/home.template b/templates/fr/home.template index 1326d82..8aa5483 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -1,5 +1,7 @@   + +  <div id="main_left"> diff --git a/templates/he/home.template b/templates/he/home.template index 28142d2..b291b7a 100644 --- a/templates/he/home.template +++ b/templates/he/home.template @@ -1,5 +1,7 @@   + +  <div id="main_left"> diff --git a/templates/pl/home.template b/templates/pl/home.template index b039d66..02a90ac 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -1,5 +1,7 @@   + +  <div id="main_left">

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011