February 2007 - Wine-commits

Detlef Riekenberg : kernel32: Display correct parameters in comm traces.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: d7e88ff996fb56267bcc09effdc549964fb6130c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e88ff996fb56267bcc09eff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 20 16:38:13 2007 +0100 kernel32: Display correct parameters in comm traces. --- dlls/kernel32/comm.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index b9fd19c..07caa83 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1198,7 +1198,7 @@ BOOL WINAPI CommConfigDialogA( HMODULE hConfigModule; BOOL r = FALSE; - TRACE("(%p %p %p)\n",lpszDevice, hWnd, lpCommConfig); + TRACE("(%s, %p, %p)\n", debugstr_a(lpszDevice), hWnd, lpCommConfig); hConfigModule = LoadLibraryW(lpszSerialUI); if(!hConfigModule) @@ -1228,7 +1228,7 @@ BOOL WINAPI CommConfigDialogW( HMODULE hConfigModule; BOOL r = FALSE; - TRACE("(%p %p %p)\n",lpszDevice, hWnd, lpCommConfig); + TRACE("(%s, %p, %p)\n", debugstr_w(lpszDevice), hWnd, lpCommConfig); hConfigModule = LoadLibraryW(lpszSerialUI); if(!hConfigModule) @@ -1266,7 +1266,7 @@ BOOL WINAPI GetCommConfig( { BOOL r; - TRACE("(%p %p)\n",hFile,lpCommConfig); + TRACE("(%p, %p, %p) *lpdwSize: %u\n", hFile, lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0 ); if(lpCommConfig == NULL) return FALSE; @@ -1300,7 +1300,7 @@ BOOL WINAPI SetCommConfig( LPCOMMCONFIG lpCommConfig, /* [in] The desired configuration. */ DWORD dwSize) /* [in] size of the lpCommConfig struct */ { - TRACE("(%p %p)\n",hFile,lpCommConfig); + TRACE("(%p, %p, %u)\n", hFile, lpCommConfig, dwSize); return SetCommState(hFile,&lpCommConfig->dcb); } @@ -1323,7 +1323,7 @@ BOOL WINAPI SetDefaultCommConfigW( HMODULE hConfigModule; BOOL r = FALSE; - TRACE("(%p %p %x)\n",lpszDevice, lpCommConfig, dwSize); + TRACE("(%s, %p, %u)\n", debugstr_w(lpszDevice), lpCommConfig, dwSize); hConfigModule = LoadLibraryW(lpszSerialUI); if(!hConfigModule) @@ -1357,7 +1357,7 @@ BOOL WINAPI SetDefaultCommConfigA( LPWSTR lpDeviceW = NULL; DWORD len; - TRACE("(%s %p %x)\n",debugstr_a(lpszDevice),lpCommConfig,dwSize); + TRACE("(%s, %p, %u)\n", debugstr_a(lpszDevice), lpCommConfig, dwSize); if (lpszDevice) { @@ -1393,12 +1393,13 @@ BOOL WINAPI GetDefaultCommConfigW( static const WCHAR comW[] = {'C','O','M',0}; static const WCHAR formatW[] = {'C','O','M','%','c',':','3','8','4','0','0',',','n',',','8',',','1',0}; + TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 ); + if (strncmpiW(lpszName,comW,3)) { ERR("not implemented for <%s>\n", debugstr_w(lpszName)); return FALSE; } - TRACE("(%s %p %d)\n", debugstr_w(lpszName), lpCC, *lpdwSize ); if (*lpdwSize < sizeof(COMMCONFIG)) { *lpdwSize = sizeof(COMMCONFIG); return FALSE; @@ -1438,7 +1439,7 @@ BOOL WINAPI GetDefaultCommConfigA( BOOL ret = FALSE; UNICODE_STRING lpszNameW; - TRACE("(%s,%p,%d)\n",lpszName,lpCC,*lpdwSize); + TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_a(lpszName), lpCC, lpdwSize, lpdwSize ? *lpdwSize : 0 ); if(lpszName) RtlCreateUnicodeStringFromAsciiz(&lpszNameW,lpszName); else lpszNameW.Buffer = NULL;

1 0

Detlef Riekenberg : localspl: Implement GetDefaultCommConfig for XcvDataPort.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 87947fce7f685aaf791ac3db843417d28b064f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87947fce7f685aaf791ac3db8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 20 18:11:53 2007 +0100 localspl: Implement GetDefaultCommConfig for XcvDataPort. --- dlls/localspl/localmon.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index fc57217..15fd6ee 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -68,6 +68,11 @@ static struct list xcv_handles = LIST_INIT( xcv_handles ); static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', 'L','P','T','P','o','r','t', 'C','o','m','m','a','n','d','O','K',0}; + +static const WCHAR cmd_GetDefaultCommConfigW[] = {'G','e','t', + 'D','e','f','a','u','l','t', + 'C','o','m','m','C','o','n','f','i','g',0}; + static const WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', 'T','r','a','n','s','m','i','s','s','i','o','n', 'R','e','t','r','y','T','i','m','e','o','u','t',0}; @@ -459,6 +464,14 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInput return res; } + if (!lstrcmpW(pszDataName, cmd_GetDefaultCommConfigW)) { + TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData)); + *pcbOutputNeeded = cbOutputData; + res = GetDefaultCommConfigW((LPWSTR) pInputData, (LPCOMMCONFIG) pOutputData, pcbOutputNeeded); + TRACE("got %u with %u\n", res, GetLastError() ); + return res ? ERROR_SUCCESS : GetLastError(); + } + if (!lstrcmpW(pszDataName, cmd_GetTransmissionRetryTimeoutW)) { * pcbOutputNeeded = sizeof(DWORD); if (cbOutputData >= sizeof(DWORD)) {

1 0

Eric Pouech : dbghelp: MiniDumpWriteDump called from exception handler.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: fa9be995687605903bf6617976af39b35647538e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9be995687605903bf661797… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 19 23:09:24 2007 +0100 dbghelp: MiniDumpWriteDump called from exception handler. - MiniDumpWriteDump was unable to provide stack information for the current thread, hence did produce unusable minidump when a programs generates the minidump from its own exception handler. - We now support this if the current thread calls MiniDumpWriteDump from an exception handler and provides the exception information. --- dlls/dbghelp/minidump.c | 95 +++++++++++++++++++++++++++++----------------- 1 files changed, 60 insertions(+), 35 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index c1b44b0..a8e2ee0 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -112,15 +112,45 @@ static BOOL fetch_process_info(struct dump_context* dc) return FALSE; } +static void fetch_thread_stack(struct dump_context* dc, void* teb_addr, + const CONTEXT* ctx, MINIDUMP_MEMORY_DESCRIPTOR* mmd) +{ + NT_TIB tib; + + if (ReadProcessMemory(dc->hProcess, teb_addr, &tib, sizeof(tib), NULL)) + { +#ifdef __i386__ + /* limiting the stack dumping to the size actually used */ + if (ctx->Esp) + mmd->StartOfMemoryRange = (ctx->Esp - 4); + else + mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; +#elif defined(__powerpc__) + if (ctx->Iar) + mmd->StartOfMemoryRange = ctx->Iar - 4; + else + mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; +#elif defined(__x86_64__) + if (ctx->Rsp) + mmd->StartOfMemoryRange = (ctx->Rsp - 8); + else + mmd->StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; +#else +#error unsupported CPU +#endif + mmd->Memory.DataSize = (ULONG_PTR)tib.StackBase - mmd->StartOfMemoryRange; + } +} + /****************************************************************** * fetch_thread_info * * fetches some information about thread of id 'tid' */ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, + const MINIDUMP_EXCEPTION_INFORMATION* except, MINIDUMP_THREAD* mdThd, CONTEXT* ctx) { - NT_TIB tib; DWORD tid = dc->spi->ti[thd_idx].dwThreadID; HANDLE hThread; THREAD_BASIC_INFORMATION tbi; @@ -149,40 +179,35 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, &tbi, sizeof(tbi), NULL) == STATUS_SUCCESS) { mdThd->Teb = (ULONG_PTR)tbi.TebBaseAddress; - if (tbi.ExitStatus == STILL_ACTIVE && tid != GetCurrentThreadId() && - (mdThd->SuspendCount = SuspendThread(hThread)) != (DWORD)-1) + if (tbi.ExitStatus == STILL_ACTIVE) { - mdThd->SuspendCount--; - ctx->ContextFlags = CONTEXT_FULL; - if (!GetThreadContext(hThread, ctx)) - memset(ctx, 0, sizeof(*ctx)); + if (tid != GetCurrentThreadId() && + (mdThd->SuspendCount = SuspendThread(hThread)) != (DWORD)-1) + { + mdThd->SuspendCount--; + ctx->ContextFlags = CONTEXT_FULL; + if (!GetThreadContext(hThread, ctx)) + memset(ctx, 0, sizeof(*ctx)); - if (ReadProcessMemory(dc->hProcess, tbi.TebBaseAddress, - &tib, sizeof(tib), NULL)) + fetch_thread_stack(dc, tbi.TebBaseAddress, ctx, &mdThd->Stack); + ResumeThread(hThread); + } + else if (tid == GetCurrentThreadId() && except) { -#ifdef __i386__ - /* limiting the stack dumping to the size actually used */ - if (ctx->Esp) - mdThd->Stack.StartOfMemoryRange = (ctx->Esp - 4); - else - mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; -#elif defined(__powerpc__) - if (ctx->Iar) - mdThd->Stack.StartOfMemoryRange = ctx->Iar - 4; - else - mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; -#elif defined(__x86_64__) - if (ctx->Rsp) - mdThd->Stack.StartOfMemoryRange = (ctx->Rsp - 8); - else - mdThd->Stack.StartOfMemoryRange = (ULONG_PTR)tib.StackLimit; -#else -#error unsupported CPU -#endif - mdThd->Stack.Memory.DataSize = (ULONG_PTR)tib.StackBase - - mdThd->Stack.StartOfMemoryRange; + CONTEXT lctx, *pctx; + if (except->ClientPointers) + { + EXCEPTION_POINTERS ep; + + ReadProcessMemory(dc->hProcess, except->ExceptionPointers, + &ep, sizeof(ep), NULL); + ReadProcessMemory(dc->hProcess, ep.ContextRecord, + &ctx, sizeof(ctx), NULL); + pctx = &lctx; + } + else pctx = except->ExceptionPointers->ContextRecord; + fetch_thread_stack(dc, tbi.TebBaseAddress, pctx, &mdThd->Stack); } - ResumeThread(hThread); } } CloseHandle(hThread); @@ -347,7 +372,6 @@ static void dump_exception_info(struct dump_context* dc, ep.ContextRecord, &ctx, sizeof(ctx), NULL); prec = &rec; pctx = &ctx; - } else { @@ -516,7 +540,8 @@ static void dump_system_info(struct dump_context* dc) * * Dumps into File the information about running threads */ -static void dump_threads(struct dump_context* dc) +static void dump_threads(struct dump_context* dc, + const MINIDUMP_EXCEPTION_INFORMATION* except) { MINIDUMP_THREAD mdThd; MINIDUMP_THREAD_LIST mdThdList; @@ -533,7 +558,7 @@ static void dump_threads(struct dump_context* dc) for (i = 0; i < dc->spi->dwThreadCount; i++) { - fetch_thread_info(dc, i, &mdThd, &ctx); + fetch_thread_info(dc, i, except, &mdThd, &ctx); flags_out = ThreadWriteThread | ThreadWriteStack | ThreadWriteContext | ThreadWriteInstructionWindow; @@ -713,7 +738,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, mdDir.StreamType = ThreadListStream; mdDir.Location.Rva = dc.rva; - dump_threads(&dc); + dump_threads(&dc, ExceptionParam); mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir));

1 0

Francois Gouget : wininet/tests: Tell the user which ftp server we' re using for the tests so he can try to connect to it manually in case of trouble .
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: eb2bf541f2859c5512759923ae587d2ffe9b2ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2bf541f2859c5512759923a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:56:50 2007 +0100 wininet/tests: Tell the user which ftp server we're using for the tests so he can try to connect to it manually in case of trouble. --- dlls/wininet/tests/ftp.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 770fdeb..4afaddd 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -126,7 +126,7 @@ static void test_createdir(void) hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); if(!hFtp) { - skip("No ftp connection could be made\n"); + skip("No ftp connection could be made to ftp.winehq.org\n"); InternetCloseHandle(hInternet); return; } @@ -187,7 +187,7 @@ static void test_deletefile(void) hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); if(!hFtp) { - skip("No ftp connection could be made\n"); + skip("No ftp connection could be made to ftp.winehq.org\n"); InternetCloseHandle(hInternet); return; } @@ -263,7 +263,7 @@ static void test_getfile(void) hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); if(!hFtp) { - skip("No ftp connection could be made\n"); + skip("No ftp connection could be made to ftp.winehq.org\n"); InternetCloseHandle(hInternet); return; } @@ -417,7 +417,7 @@ static void test_openfile(void) hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); if(!hFtp) { - skip("No ftp connection could be made\n"); + skip("No ftp connection could be made to ftp.winehq.org\n"); InternetCloseHandle(hInternet); return; } @@ -543,7 +543,7 @@ static void test_putfile(void) hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); if(!hFtp) { - skip("No ftp connection could be made\n"); + skip("No ftp connection could be made to ftp.winehq.org\n"); InternetCloseHandle(hInternet); return; } @@ -640,7 +640,7 @@ static void test_removedir(void) hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); if(!hFtp) { - skip("No ftp connection could be made\n"); + skip("No ftp connection could be made to ftp.winehq.org\n"); InternetCloseHandle(hInternet); return; } @@ -709,7 +709,7 @@ static void test_renamefile(void) hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); if(!hFtp) { - skip("No ftp connection could be made\n"); + skip("No ftp connection could be made to ftp.winehq.org\n"); InternetCloseHandle(hInternet); return; }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 93494f2ac0176072f6d68eb2fbbfc85687cce175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93494f2ac0176072f6d68eb2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:57:10 2007 +0100 Assorted spelling fixes. --- dlls/comctl32/tests/header.c | 2 +- dlls/comctl32/tests/monthcal.c | 4 ++-- dlls/d3d9/tests/visual.c | 6 +++--- dlls/ddraw/tests/refcount.c | 2 +- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- dlls/wininet/ftp.c | 2 +- tools/winapi/winapi.pm | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 5f65f95..29ef9aa 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -520,7 +520,7 @@ static void test_hdm_getitemrect(void) expect(80, rect.right); expect(18, rect.bottom); retVal = SendMessage(hWndHeader, HDM_GETITEMRECT, 10, (LPARAM) &rect); - ok(retVal == 0, "Getting rect of non-existing item should return 0, got %d\n", retVal); + ok(retVal == 0, "Getting rect of nonexistent item should return 0, got %d\n", retVal); } static void test_hdm_layout (void) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 80829ce..6de5be8 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -237,7 +237,7 @@ static void test_monthcal_currDate(HWND hwnd) expect(st_original.wMinute, st_new.wMinute); expect(st_original.wSecond, st_new.wSecond); - /* lparam can not be NULL */ + /* lparam cannot be NULL */ res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM) NULL); expect(0, res); } @@ -258,7 +258,7 @@ static void test_monthcal_firstDay(HWND hwnd) res = SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) 0); expect(fday, res); }else{ - skip("Can not retrive first day of the week\n"); + skip("Cannot retrieve first day of the week\n"); SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) 0); } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 40b8134..f5c15a0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20,8 +20,8 @@ /* This test framework allows limited testing of rendering results. Things are rendered, shown on * the framebuffer, read back from there and compared to expected colors. * - * However, neither d3d nor opengl is guaranted to be pixel exact, and thus the capability of this test - * is rather limited. As a general guideline for adding tests, do not rely on corner pixels. Draw a big enought + * However, neither d3d nor opengl is guaranteed to be pixel exact, and thus the capability of this test + * is rather limited. As a general guideline for adding tests, do not rely on corner pixels. Draw a big enough * area which shows specific behavior(like a quad on the whole screen), and try to get resulting colos with * all bits set or unset in all channels(like pure red, green, blue, white, black). Hopefully everything that * causes visible results in games can be tested in a way that does not depend on pixel exactness @@ -261,7 +261,7 @@ static void lighting_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); /* Hack for a bug in d3d9: SetFVF creates a converted vertex declaration, with a circular refcount. - * This prevents the screen resulution from beeing restored correctly on device release. Unset the vdecl + * This prevents the screen resolution from being restored correctly on device release. Unset the vdecl */ IDirect3DDevice9_SetVertexDeclaration(device, NULL); } diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 11301d3..916e8f5 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -165,7 +165,7 @@ static void test_ddraw_objects(void) ok(ref == 1, "Got refcount %ld, expected 1\n", ref); IDirectDrawPalette_Release(palette); - /* Simmilar for surfaces */ + /* Similar for surfaces */ hr = IDirectDraw4_CreateSurface(DDraw4, &ddsd, &surface4, NULL); ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); ref = getRefcount( (IUnknown *) DDraw4); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 603ce49..ac2ca44 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -197,7 +197,7 @@ static GLXFBConfig* pbuffer_find_fbconfigs( * This: Device to activate the context for * target: Surface this context will render to * display: X11 connection - * win: Taget window. NULL for a pbuffer + * win: Target window. NULL for a pbuffer * *****************************************************************************/ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, Display *display, Window win) { @@ -368,7 +368,7 @@ out: * Removes a context from the context manager. The opengl context is not * destroyed or unset. context is not a valid pointer after that call. * - * Simmilar to the former call this isn't a performance critical function. A + * Similar to the former call this isn't a performance critical function. A * helper function for DestroyContext. * * Params: diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f78720a..1a73b57 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2839,7 +2839,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W updateFog = TRUE; } - /* Reapply lighting if it is not sheduled for reapplication already */ + /* Reapply lighting if it is not scheduled for reapplication already */ if(!isStateDirty(context, STATE_RENDER(WINED3DRS_LIGHTING))) { state_lighting(STATE_RENDER(WINED3DRS_LIGHTING), stateblock, context); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 562adcd..00199c8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -266,8 +266,8 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { TRACE("Activating primary front buffer\n"); ActivateContext(device, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); } else { - TRACE("Device is beeing destroyed, setting lastActiveRenderTarget = 0xdeadbabe\n"); - /* Implicit render target destroyed, that means the device is beeing destroyed + TRACE("Device is being destroyed, setting lastActiveRenderTarget = 0xdeadbabe\n"); + /* Implicit render target destroyed, that means the device is being destroyed * whatever we set here, it shouldn't matter */ device->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; @@ -760,7 +760,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED /* TODO: Make sure that *any* context is active for this thread. It is not important which context that is, * nor that is has any special setup(CTXUSAGE_LOADRESOURCE is fine), but the code below needs a context. - * A context is guaranted to be there in a single threaded environment, but not with multithreading + * A context is guaranteed to be there in a single threaded environment, but not with multithreading */ if (0 != This->glDescription.textureName) { /* Now I have to copy thing bits back */ @@ -2802,7 +2802,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } } - /* Default: Fall back to the generic blt. Not an error, a TRACE is enought */ + /* Default: Fall back to the generic blt. Not an error, a TRACE is enough */ TRACE("Didn't find any usable render target setup for hw blit, falling back to software\n"); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index be8cd6e..e314fd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,7 +560,7 @@ typedef struct IWineD3DImpl extern const IWineD3DVtbl IWineD3D_Vtbl; -/* TODO: setup some flags in the regestry to enable, disable pbuffer support +/* TODO: setup some flags in the registry to enable, disable pbuffer support (since it will break quite a few things until contexts are managed properly!) */ extern BOOL pbuffer_support; /* allocate one pbuffer per surface */ diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0e09a51..05fd301 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3421,7 +3421,7 @@ static DWORD FTP_SetResponseError(DWORD dwResponse) case 451: /* Action aborted. Server error. */ case 452: /* Action not taken. Insufficient storage space on server. */ case 502: /* Command not implemented. */ - case 503: /* Bad sequence of command. */ + case 503: /* Bad sequence of commands. */ case 504: /* Command not implemented for that parameter. */ case 532: /* Need account for storing files */ case 551: /* Requested action aborted. Page type unknown */ diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index eb85d08..5bf4ce6 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -385,7 +385,7 @@ sub parse_spec_file($$) { my $name4 = $name; $name4 =~ s/^(VxDCall)\d$/$1/; - # FIXME: This special case is becuase of a very ugly kludge that should be fixed IMHO + # FIXME: This special case is because of a very ugly kludge that should be fixed IMHO my $name5 = $name; $name5 =~ s/^(.*?16)_(.*?)$/$1_fn$2/;

1 0

Francois Gouget : wininet/tests: Dynamically load some functions so the test runs on Windows 98.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: f410bbf09887cc8cdbd0aa052ab45da7edc0b02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f410bbf09887cc8cdbd0aa052… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:53:49 2007 +0100 wininet/tests: Dynamically load some functions so the test runs on Windows 98. --- dlls/wininet/tests/http.c | 65 +++++++++++++++++++++++++++++++-------------- 1 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d6e9bb4..91438c6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -35,6 +35,13 @@ static HANDLE hCompleteEvent; +static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET ,INTERNET_STATUS_CALLBACK); +static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); +static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); +static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD); +static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD); + + static VOID WINAPI callback( HINTERNET hInternet, DWORD_PTR dwContext, @@ -176,7 +183,7 @@ static void InternetReadFile_test(int flags) if (hi == 0x0) goto abort; - InternetSetStatusCallback(hi,&callback); + pInternetSetStatusCallbackA(hi,&callback); trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, "www.winehq.org", INTERNET_INVALID_PORT_NUMBER, @@ -318,7 +325,7 @@ static void InternetReadFileExA_test(int flags) if (hi == 0x0) goto abort; - InternetSetStatusCallback(hi,&callback); + pInternetSetStatusCallbackA(hi,&callback); trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, "www.winehq.org", INTERNET_INVALID_PORT_NUMBER, @@ -488,7 +495,7 @@ static void InternetTimeFromSystemTimeA_test(void) char string[INTERNET_RFC1123_BUFSIZE]; static const char expect[] = "Fri, 07 Jan 2005 12:06:35 GMT"; - ret = InternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); + ret = pInternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); ok( ret, "InternetTimeFromSystemTimeA failed (%u)\n", GetLastError() ); ok( !memcmp( string, expect, sizeof(expect) ), @@ -503,7 +510,7 @@ static void InternetTimeFromSystemTimeW_test(void) static const WCHAR expect[] = { 'F','r','i',',',' ','0','7',' ','J','a','n',' ','2','0','0','5',' ', '1','2',':','0','6',':','3','5',' ','G','M','T',0 }; - ret = InternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); + ret = pInternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string) ); ok( ret, "InternetTimeFromSystemTimeW failed (%u)\n", GetLastError() ); ok( !memcmp( string, expect, sizeof(expect) ), @@ -518,12 +525,12 @@ static void InternetTimeToSystemTimeA_test(void) static const char string[] = "Fri, 07 Jan 2005 12:06:35 GMT"; static const char string2[] = " fri 7 jan 2005 12 06 35"; - ret = InternetTimeToSystemTimeA( string, &time, 0 ); + ret = pInternetTimeToSystemTimeA( string, &time, 0 ); ok( ret, "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); ok( !memcmp( &time, &expect, sizeof(expect) ), "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); - ret = InternetTimeToSystemTimeA( string2, &time, 0 ); + ret = pInternetTimeToSystemTimeA( string2, &time, 0 ); ok( ret, "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); ok( !memcmp( &time, &expect, sizeof(expect) ), "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); @@ -540,29 +547,29 @@ static void InternetTimeToSystemTimeW_test(void) '1','2',' ','0','6',' ','3','5',0 }; static const WCHAR string3[] = { 'F','r',0 }; - ret = InternetTimeToSystemTimeW( NULL, NULL, 0 ); + ret = pInternetTimeToSystemTimeW( NULL, NULL, 0 ); ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - ret = InternetTimeToSystemTimeW( NULL, &time, 0 ); + ret = pInternetTimeToSystemTimeW( NULL, &time, 0 ); ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - ret = InternetTimeToSystemTimeW( string, NULL, 0 ); + ret = pInternetTimeToSystemTimeW( string, NULL, 0 ); ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - ret = InternetTimeToSystemTimeW( string, &time, 0 ); + ret = pInternetTimeToSystemTimeW( string, &time, 0 ); ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ret = InternetTimeToSystemTimeW( string, &time, 0 ); + ret = pInternetTimeToSystemTimeW( string, &time, 0 ); ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); ok( !memcmp( &time, &expect, sizeof(expect) ), "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ret = InternetTimeToSystemTimeW( string2, &time, 0 ); + ret = pInternetTimeToSystemTimeW( string2, &time, 0 ); ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); ok( !memcmp( &time, &expect, sizeof(expect) ), "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ret = InternetTimeToSystemTimeW( string3, &time, 0 ); + ret = pInternetTimeToSystemTimeW( string3, &time, 0 ); ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); } @@ -1128,15 +1135,33 @@ static void test_http_connection(void) START_TEST(http) { - InternetReadFile_test(INTERNET_FLAG_ASYNC); - InternetReadFile_test(0); - InternetReadFileExA_test(INTERNET_FLAG_ASYNC); + HMODULE hdll; + hdll = GetModuleHandleA("wininet.dll"); + pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); + pInternetTimeFromSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeA"); + pInternetTimeFromSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeW"); + pInternetTimeToSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeA"); + pInternetTimeToSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeW"); + + if (!pInternetSetStatusCallbackA) + skip("skipping the InternetReadFile tests\n"); + else + { + InternetReadFile_test(INTERNET_FLAG_ASYNC); + InternetReadFile_test(0); + InternetReadFileExA_test(INTERNET_FLAG_ASYNC); + } InternetOpenRequest_test(); InternetOpenUrlA_test(); - InternetTimeFromSystemTimeA_test(); - InternetTimeFromSystemTimeW_test(); - InternetTimeToSystemTimeA_test(); - InternetTimeToSystemTimeW_test(); + if (!pInternetTimeFromSystemTimeA) + skip("skipping the InternetTime tests\n"); + else + { + InternetTimeFromSystemTimeA_test(); + InternetTimeFromSystemTimeW_test(); + InternetTimeToSystemTimeA_test(); + InternetTimeToSystemTimeW_test(); + } HttpSendRequestEx_test(); HttpHeaders_test(); test_http_connection();

1 0

Francois Gouget : winapi_check: gdi32.dll and gdi. exe have some extra sources in subdirectories.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 2138bab79f4732baafb726233356f03fcc88d872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2138bab79f4732baafb726233… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:51:30 2007 +0100 winapi_check: gdi32.dll and gdi.exe have some extra sources in subdirectories. --- tools/winapi/modules.pm | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/winapi/modules.pm b/tools/winapi/modules.pm index 14b29b8..cbf1a2a 100644 --- a/tools/winapi/modules.pm +++ b/tools/winapi/modules.pm @@ -110,6 +110,17 @@ sub find_spec_files($) { $$spec_file_found{$spec_file}++; $$spec_file2dir{$spec_file}{$allowed_dir}++; $$dir2spec_file{$allowed_dir}{$spec_file}++; + # gdi32.dll and gdi.exe have some extra sources in subdirectories + if ($spec_file =~ m!/gdi32\.spec$!) + { + $$spec_file2dir{$spec_file}{"$allowed_dir/enhmfdrv"}++; + $$dir2spec_file{"$allowed_dir/enhmfdrv"}{$spec_file}++; + } + if ($spec_file =~ m!/gdi(?:32|\.exe)\.spec$!) + { + $$spec_file2dir{$spec_file}{"$allowed_dir/mfdrv"}++; + $$dir2spec_file{"$allowed_dir/mfdrv"}{$spec_file}++; + } } return $spec_file_found;

1 0

Francois Gouget : wininet: Move a bunch of misplaced API documentation.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: da64fe5d567bdb0ec013a1756079a8e0e3241eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=da64fe5d567bdb0ec013a1756… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:52:01 2007 +0100 wininet: Move a bunch of misplaced API documentation. --- dlls/wininet/ftp.c | 201 ++++++++++++++++++++++++++-------------------------- 1 files changed, 101 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da64fe5d567bdb0ec013a…

1 0

Francois Gouget : winapi_check: We no longer have dlls in nested sub-directories.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: c5f193038c918c9a088bbae363ebe8e2d31c196f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f193038c918c9a088bbae36… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:51:03 2007 +0100 winapi_check: We no longer have dlls in nested sub-directories. --- tools/winapi/modules.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/modules.pm b/tools/winapi/modules.pm index 134f697..14b29b8 100644 --- a/tools/winapi/modules.pm +++ b/tools/winapi/modules.pm @@ -100,7 +100,7 @@ sub find_spec_files($) { my $allowed_dir; my $spec_file; - my @spec_files = <{dlls/*/*.spec,dlls/*/*/*.spec}>; + my @spec_files = <{dlls/*/*.spec}>; foreach $spec_file (@spec_files) { $spec_file =~ /(.*)\/.*\.spec/;

1 0

Francois Gouget : winapi_check: Clarify a pair of error messages.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 53914087aa8970e15855e6e7928737c2be8b1a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53914087aa8970e15855e6e79… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:50:49 2007 +0100 winapi_check: Clarify a pair of error messages. Don't use a regular expression if not necessary. --- tools/winapi/winapi_documentation.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm index 0cbdac1..f41cd49 100644 --- a/tools/winapi/winapi_documentation.pm +++ b/tools/winapi/winapi_documentation.pm @@ -137,7 +137,7 @@ sub check_documentation($) { } elsif ($ordinal eq "init") { $ordinal = 0; } else { - $output->write("documentation: $external_name (\U$module\E.$ordinal) wrong1\n"); + $output->write("documentation: invalid ordinal for $external_name (\U$module\E.$ordinal)\n"); next; } @@ -164,8 +164,8 @@ sub check_documentation($) { } - if (!$found && $external_name ne "DllMain" && $ordinal !~ /^0$/) { - $output->write("documentation: $external_name (\U$module\E.$ordinal) wrong2\n"); + if (!$found && $external_name ne "DllMain" && $ordinal ne "0") { + $output->write("documentation: $external_name (\U$module\E.$ordinal) not declared in the spec file\n"); } } }

1 0