July 2008 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : regedit: Convert openKey to Unicode.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: db074ee9a336fe3c6576d05c96992b746e75e7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db074ee9a336fe3c6576d05c9… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 9 21:42:20 2008 +0200 regedit: Convert openKey to Unicode. --- programs/regedit/regproc.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index bed68af..bbced33 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -418,10 +418,10 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data) * A helper function for processRegEntry() that opens the current key. * That key must be closed by calling closeKey(). */ -static LONG openKey(LPSTR stdInput) +static LONG openKeyW(WCHAR* stdInput) { HKEY keyClass; - LPSTR keyPath; + WCHAR* keyPath; DWORD dwDisp; LONG res; @@ -430,10 +430,10 @@ static LONG openKey(LPSTR stdInput) return ERROR_INVALID_PARAMETER; /* Get the registry class */ - if (!parseKeyName(stdInput, &keyClass, &keyPath)) + if (!parseKeyNameW(stdInput, &keyClass, &keyPath)) return ERROR_INVALID_PARAMETER; - res = RegCreateKeyEx( + res = RegCreateKeyExW( keyClass, /* Class */ keyPath, /* Sub Key */ 0, /* MUST BE 0 */ @@ -446,15 +446,9 @@ static LONG openKey(LPSTR stdInput) REG_OPENED_EXISTING_KEY */ if (res == ERROR_SUCCESS) - { - currentKeyName = HeapAlloc(GetProcessHeap(), 0, strlen(stdInput)+1); - CHECK_ENOUGH_MEMORY(currentKeyName); - strcpy(currentKeyName, stdInput); - } + currentKeyName = GetMultiByteString(stdInput); else - { currentKeyHandle = NULL; - } return res; @@ -558,6 +552,7 @@ static void processRegEntry(LPSTR stdInput) if ( stdInput[0] == '[') /* We are reading a new key */ { LPSTR keyEnd; + WCHAR* stdInputW; closeKey(); /* Close the previous key */ /* Get rid of the square brackets */ @@ -566,17 +561,18 @@ static void processRegEntry(LPSTR stdInput) if (keyEnd) *keyEnd='\0'; + stdInputW = GetWideString(stdInput); + /* delete the key if we encounter '-' at the start of reg key */ if ( stdInput[0] == '-') { - WCHAR* stdInputW = GetWideString(stdInput + 1); - delete_registry_key(stdInputW); - HeapFree(GetProcessHeap(), 0, stdInputW); - } else if ( openKey(stdInput) != ERROR_SUCCESS ) + delete_registry_key(stdInputW + 1); + } else if ( openKeyW(stdInputW) != ERROR_SUCCESS ) { fprintf(stderr,"%s: setValue failed to open key %s\n", getAppName(), stdInput); } + HeapFree(GetProcessHeap(), 0, stdInputW); } else if( currentKeyHandle && (( stdInput[0] == '@') || /* reading a default @=data pair */ ( stdInput[0] == '\"'))) /* reading a new value=data pair */ @@ -1017,7 +1013,7 @@ BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name) if (reg_key_name && reg_key_name[0]) { HKEY reg_key_class; - CHAR *branch_name; + CHAR *branch_name = NULL; HKEY key; REGPROC_resize_char_buffer(&reg_key_name_buf, &reg_key_name_len,

1 0

Maarten Lankhorst : ntdll: Use module for path to activation context.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: e98933a2795363471673fef8779112826bf13f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98933a2795363471673fef87… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jun 22 00:11:23 2008 -0700 ntdll: Use module for path to activation context. --- dlls/ntdll/actctx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 8f9a2c1..80e9e03 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2210,9 +2210,12 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) { UNICODE_STRING dir; WCHAR *p; + HMODULE module; - if ((status = get_module_filename( NtCurrentTeb()->Peb->ImageBaseAddress, &dir, 0 ))) - goto error; + if (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID) module = pActCtx->hModule; + else module = NtCurrentTeb()->Peb->ImageBaseAddress; + + if ((status = get_module_filename( module, &dir, 0 ))) goto error; if ((p = strrchrW( dir.Buffer, '\\' ))) p[1] = 0; actctx->appdir.info = dir.Buffer; }

1 0

Zac Brown : wininet/tests: Change some traces to skips in tests.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 173cd38e68cc0857317e9f0b63d10422fe32e3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173cd38e68cc0857317e9f0b6… Author: Zac Brown <zac(a)zacbrown.org> Date: Wed Jul 9 18:04:05 2008 -0700 wininet/tests: Change some traces to skips in tests. --- dlls/wininet/tests/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 272e3e7..6e27669 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -881,7 +881,7 @@ static void HttpSendRequestEx_test(void) NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!hRequest && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { - trace( "Network unreachable, skipping test\n" ); + skip( "Network unreachable, skipping test\n" ); goto done; } ok( hRequest != NULL, "Failed to open request handle err %u\n", GetLastError()); @@ -948,7 +948,7 @@ static void InternetOpenRequest_test(void) request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { - trace( "Network unreachable, skipping test\n" ); + skip( "Network unreachable, skipping test\n" ); goto done; } ok(request != NULL, "Failed to open request handle err %u\n", GetLastError()); @@ -990,7 +990,7 @@ static void test_http_cache(void) request = HttpOpenRequestA(connect, NULL, "/site/about", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { - trace( "Network unreachable, skipping test\n" ); + skip( "Network unreachable, skipping test\n" ); ok(InternetCloseHandle(connect), "Close connect handle failed\n"); ok(InternetCloseHandle(session), "Close session handle failed\n"); @@ -1086,7 +1086,7 @@ static void HttpHeaders_test(void) NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); if (!hRequest && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { - trace( "Network unreachable, skipping test\n" ); + skip( "Network unreachable, skipping test\n" ); goto done; } ok( hRequest != NULL, "Failed to open request handle\n");

1 0

Maarten Lankhorst : quartz: Make filtergraph quieter.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 86393897a8da29935c145f3cd81d3f4ad56379e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86393897a8da29935c145f3cd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 9 13:01:19 2008 -0700 quartz: Make filtergraph quieter. --- dlls/quartz/filtergraph.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5d2796d..b82cbcd 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -710,7 +710,7 @@ static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, hr = IPin_Connect(ppin, pConnectedTo, NULL); IPin_Release(pConnectedTo); if (FAILED(hr)) - ERR("Reconnecting pins failed, pins are not connected now..\n"); + WARN("Reconnecting pins failed, pins are not connected now..\n"); TRACE("(%p->%p) -- %p %p -> %x\n", iface, This, ppin, pConnectedTo, hr); return hr; } @@ -785,7 +785,7 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi *pppins = CoTaskMemAlloc(sizeof(IPin*)*nb); hr = IPin_QueryInternalConnections(pinputpin, *pppins, &nb); if (hr != S_OK) { - ERR("Error (%x)\n", hr); + WARN("Error (%x)\n", hr); } } else if (hr == E_NOTIMPL) { /* Input connected to all outputs */ @@ -795,7 +795,7 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi TRACE("E_NOTIMPL\n"); hr = IBaseFilter_EnumPins(pfilter, &penumpins); if (FAILED(hr)) { - ERR("filter Enumpins failed (%x)\n", hr); + WARN("filter Enumpins failed (%x)\n", hr); return hr; } i = 0; @@ -822,11 +822,11 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi IEnumPins_Release(penumpins); nb = i; if (FAILED(hr)) { - ERR("Next failed (%x)\n", hr); + WARN("Next failed (%x)\n", hr); return hr; } } else if (FAILED(hr)) { - ERR("Cannot get internal connection (%x)\n", hr); + WARN("Cannot get internal connection (%x)\n", hr); return hr; } @@ -1386,10 +1386,10 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, INT i; hr = IFilterGraph2_Render(iface, ppinreader); - ERR("Render %08x\n", hr); + TRACE("Render %08x\n", hr); for (i = 0; i < This->nFilters; ++i) - FIXME("Filters in chain: %s\n", debugstr_w(This->pFilterNames[i])); + TRACE("Filters in chain: %s\n", debugstr_w(This->pFilterNames[i])); if (SUCCEEDED(hr)) any = TRUE; @@ -1489,33 +1489,33 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, if (FAILED(hr)) hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); if (FAILED(hr)) { - ERR("Unable to create file source filter (%x)\n", hr); + WARN("Unable to create file source filter (%x)\n", hr); return hr; } hr = IFilterGraph2_AddFilter(iface, preader, lpcwstrFilterName); if (FAILED(hr)) { - ERR("Unable add filter (%x)\n", hr); + WARN("Unable add filter (%x)\n", hr); IBaseFilter_Release(preader); return hr; } hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (LPVOID*)&pfile); if (FAILED(hr)) { - ERR("Unable to get IFileSourceInterface (%x)\n", hr); + WARN("Unable to get IFileSourceInterface (%x)\n", hr); goto error; } /* Load the file in the file source filter */ hr = IFileSourceFilter_Load(pfile, lpcwstrFileName, NULL); if (FAILED(hr)) { - ERR("Load (%x)\n", hr); + WARN("Load (%x)\n", hr); goto error; } IFileSourceFilter_GetCurFile(pfile, &filename, &mt); if (FAILED(hr)) { - ERR("GetCurFile (%x)\n", hr); + WARN("GetCurFile (%x)\n", hr); goto error; } @@ -1831,7 +1831,7 @@ static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter hr = IBaseFilter_EnumPins(pfilter, &pEnum); if (hr != S_OK) { - ERR("Enum pins failed %x\n", hr); + WARN("Enum pins failed %x\n", hr); continue; } /* Check if it is a source filter */ @@ -2081,7 +2081,7 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, hr = IBaseFilter_EnumPins(pfilter, &pEnum); if (hr != S_OK) { - ERR("Enum pins failed %x\n", hr); + WARN("Enum pins failed %x\n", hr); continue; } /* Check if it is a source filter */

1 0

Maarten Lankhorst : quartz: Call run before pausing in transform filter.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: e47bc7725e22b39d12e3408bda9f32be7d8435f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47bc7725e22b39d12e3408bd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 9 12:57:10 2008 -0700 quartz: Call run before pausing in transform filter. --- dlls/quartz/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 855e466..9df01f2 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -337,7 +337,7 @@ static HRESULT WINAPI TransformFilter_Pause(IBaseFilter * iface) EnterCriticalSection(&This->csFilter); { if (This->state == State_Stopped) - ((InputPin *)This->ppPins[0])->end_of_stream = 0; + IBaseFilter_Run(iface, -1); This->state = State_Paused; }

1 0

Francois Gouget : configure: On Solaris liblber needs libsocket.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: bcba2705ce400298676f7674cd37f7fae24d0534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcba2705ce400298676f7674c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 10 12:36:06 2008 +0200 configure: On Solaris liblber needs libsocket. --- configure | 589 ++++++++++++++++++++++++++++++++-------------------------- configure.ac | 50 +++--- 2 files changed, 349 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcba2705ce400298676f7…

1 0

Maarten Lankhorst : quartz: Make parser start even if some of the pins aren 't connected.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: fe9840f213d12967d99deda02d1c703b77a3ac94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9840f213d12967d99deda02… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 9 13:00:43 2008 -0700 quartz: Make parser start even if some of the pins aren't connected. --- dlls/quartz/parser.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 0848e84..6883e47 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -277,7 +277,8 @@ HRESULT WINAPI Parser_Pause(IBaseFilter * iface) EnterCriticalSection(&This->csFilter); } - This->state = State_Paused; + if (SUCCEEDED(hr)) + This->state = State_Paused; LeaveCriticalSection(&This->csFilter); LeaveCriticalSection(&pin->thread_lock); @@ -298,6 +299,8 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) EnterCriticalSection(&pin->thread_lock); EnterCriticalSection(&This->csFilter); { + HRESULT hr_any = VFW_E_NOT_CONNECTED; + if (This->state == State_Running || This->state == State_Paused) { This->state = State_Running; @@ -311,10 +314,11 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) for (i = 1; i < (This->cStreams + 1); i++) { hr = OutputPin_CommitAllocator((OutputPin *)This->ppPins[i]); - if (FAILED(hr)) - break; + if (SUCCEEDED(hr)) + hr_any = hr; } + hr_any = hr; if (SUCCEEDED(hr)) { LeaveCriticalSection(&This->csFilter);

1 0

Alexander Nicolaysen Sørnes : regedit: Use RegSetValueExW when importing data.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: c23da6c35fb8f23acfa1eceeb3a3cba4f6d5f2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23da6c35fb8f23acfa1eceeb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 9 20:02:02 2008 +0200 regedit: Use RegSetValueExW when importing data. --- programs/regedit/regproc.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 7101e3a..f8f4eca 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -202,11 +202,11 @@ static DWORD getDataType(LPSTR *lpValue, DWORD* parse_type) /****************************************************************************** * Replaces escape sequences with the characters. */ -static void REGPROC_unescape_string(LPSTR str) +static void REGPROC_unescape_string(WCHAR* str) { int str_idx = 0; /* current character under analysis */ int val_idx = 0; /* the last character of the unescaped string */ - int len = strlen(str); + int len = lstrlenW(str); for (str_idx = 0; str_idx < len; str_idx++, val_idx++) { if (str[str_idx] == '\\') { str_idx++; @@ -328,7 +328,7 @@ static HKEY currentKeyHandle = NULL; * val_name - name of the registry value * val_data - registry value data */ -static LONG setValue(LPSTR val_name, LPSTR val_data) +static LONG setValue(WCHAR* val_name, LPSTR val_data) { LONG res; DWORD dwDataType, dwParseType; @@ -340,7 +340,7 @@ static LONG setValue(LPSTR val_name, LPSTR val_data) if (strcmp(val_data, "-") == 0) { - res=RegDeleteValue(currentKeyHandle,val_name); + res=RegDeleteValueW(currentKeyHandle,val_name); return (res == ERROR_FILE_NOT_FOUND ? ERROR_SUCCESS : res); } @@ -349,19 +349,21 @@ static LONG setValue(LPSTR val_name, LPSTR val_data) if (dwParseType == REG_SZ) /* no conversion for string */ { - REGPROC_unescape_string(val_data); + WCHAR* val_dataW = GetWideString(val_data, lstrlenA(val_data)+1); + REGPROC_unescape_string(val_dataW); /* Compute dwLen after REGPROC_unescape_string because it may * have changed the string length and we don't want to store * the extra garbage in the registry. */ - dwLen = strlen(val_data); - if (dwLen>0 && val_data[dwLen-1]=='"') + dwLen = lstrlenW(val_dataW); + if (dwLen>0 && val_dataW[dwLen-1]=='"') { dwLen--; - val_data[dwLen]='\0'; + val_dataW[dwLen]='\0'; } - lpbData = (BYTE*) val_data; + lpbData = (BYTE*) val_dataW; dwLen++; /* include terminating null */ + dwLen = dwLen * sizeof(WCHAR); /* size is in bytes */ } else if (dwParseType == REG_DWORD) /* Convert the dword types */ { @@ -382,14 +384,14 @@ static LONG setValue(LPSTR val_name, LPSTR val_data) return ERROR_INVALID_DATA; } - res = RegSetValueEx( + res = RegSetValueExW( currentKeyHandle, val_name, 0, /* Reserved */ dwDataType, lpbData, dwLen); - if (dwParseType == REG_BINARY) + if (dwParseType == REG_BINARY || dwParseType == REG_SZ) HeapFree(GetProcessHeap(), 0, lpbData); return res; } @@ -465,6 +467,7 @@ static void processSetValue(LPSTR line) { LPSTR val_name; /* registry value name */ LPSTR val_data; /* registry value data */ + WCHAR* val_nameW; int line_idx = 0; /* current character under analysis */ LONG res; @@ -504,8 +507,10 @@ static void processSetValue(LPSTR line) line_idx++; /* skip the '=' character */ val_data = line + line_idx; - REGPROC_unescape_string(val_name); - res = setValue(val_name, val_data); + val_nameW = GetWideString(val_name, lstrlenA(val_name)+1); + REGPROC_unescape_string(val_nameW); + res = setValue(val_nameW, val_data); + HeapFree(GetProcessHeap(), 0, val_nameW); if ( res != ERROR_SUCCESS ) fprintf(stderr,"%s: ERROR Key %s not created. Value: %s, Data: %s\n", getAppName(),

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: dbaec0a101d3f2bb964d20d675fa53d64f7f8c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbaec0a101d3f2bb964d20d67… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 10 00:25:28 2008 +0200 Assorted spelling fixes. --- dlls/gdiplus/tests/font.c | 2 +- dlls/quartz/filtergraph.c | 2 +- dlls/riched20/tests/editor.c | 2 +- dlls/secur32/secur32.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/winemp3.acm/mpegl3.c | 2 +- dlls/winex11.drv/wintab.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 96ed64c..0487655 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -154,7 +154,7 @@ static void test_fontfamily (void) WCHAR itsName[LF_FACESIZE]; GpStatus stat; - /* FontFamily can not be NULL */ + /* FontFamily cannot be NULL */ stat = GdipCreateFontFamilyFromName (arial , NULL, NULL); expect (InvalidParameter, stat); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d2f10b6..5d2796d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1192,7 +1192,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) hr = IPin_Connect(ppinOut, pin, NULL); if (SUCCEEDED(hr)) { - TRACE("Connected succesfully %p/%p, %08x look if we should render more!\n", ppinOut, pin, hr); + TRACE("Connected successfully %p/%p, %08x look if we should render more!\n", ppinOut, pin, hr); IPin_Release(pin); hr = FilterGraph2_RenderRecurse(This, pin); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0776fe4..16085d3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3687,7 +3687,7 @@ static void test_EM_STREAMIN(void) struct StringWithLength cookieForStream4; const char * streamText4 = "This text just needs to be long enough to cause run to be split onto "\ - "two seperate lines and make sure the null terminating character is "\ + "two separate lines and make sure the null terminating character is "\ "handled properly.\0"; int length4 = strlen(streamText4) + 1; cookieForStream4.buffer = (char *)streamText4; diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index b9c4748..8b3c2bb 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -634,7 +634,7 @@ SecurePackage *SECUR32_findPackageW(PCWSTR packageName) fnTableA = pInitSecurityInterfaceA(); if (pInitSecurityInterfaceW) fnTableW = pInitSecurityInterfaceW(); - /* dont't update built-in SecurityFunctionTable */ + /* don't update built-in SecurityFunctionTable */ if (fnTableA != &securityFunctionTableA) _makeFnTableA(&ret->provider->fnTableA, fnTableA, fnTableW); if (fnTableW != &securityFunctionTableW) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 10cd52e..76e1c80 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3622,7 +3622,7 @@ struct driver_version_information { static const struct driver_version_information driver_version_table[] = { /* Nvidia drivers. Geforce6 and newer cards are supported by the current driver (177.x)*/ - /* GeforceFX support is up to 173.x, Geforce2MX/3/4 upto 96.x, TNT/Geforce1/2 upto 71.x */ + /* GeforceFX support is up to 173.x, Geforce2MX/3/4 up to 96.x, TNT/Geforce1/2 up to 71.x */ /* Note that version numbers >100 lets say 123.45 use >= x.y.11.2345 and not x.y.10.12345 */ {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, 7, 15, 11, 7341 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, 7, 15, 11, 7341 }, diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 5ad4433..1ea19c0 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -168,7 +168,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, if (ret != MP3_OK) { if (ret == MP3_ERR) - FIXME("Error occured during decoding!\n"); + FIXME("Error occurred during decoding!\n"); *ndst = *nsrc = 0; return; } diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index e73f000..4a77c1b 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -301,7 +301,7 @@ static INT button_state[10]; * Now say someone has 2 multimode tablets with 2 erasers each * now we would need Cursor #2, #5, #8, #11 * So to support that we need CURSORMAX of 12 (0 to 11) - * FIXME: we dont support more than 4 regular tablets or 2 multimode tablets */ + * FIXME: we don't support more than 4 regular tablets or 2 multimode tablets */ #define CURSORMAX 12 static LOGCONTEXTW gSysContext;

1 0

Francois Gouget : gdiplus: Add/fix the trailing '\n' to Wine traces.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: f7c5736340f539042ce25769349484e1750cb4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c5736340f539042ce257693… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 10 12:33:26 2008 +0200 gdiplus: Add/fix the trailing '\n' to Wine traces. --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 63e314d..e985f29 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -327,7 +327,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, { if (!(font && height)) return InvalidParameter; - FIXME("%p (%s), %f, %p\n)", font, + FIXME("%p (%s), %f, %p\n", font, debugstr_w(font->lfw.lfFaceName), dpi, height); return NotImplemented; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bf2ac35..8fd452a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -244,7 +244,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) { if (!(image && cloneImage)) return InvalidParameter; - FIXME("stub: %p, %p", image, cloneImage); + FIXME("stub: %p, %p\n", image, cloneImage); return NotImplemented; }

1 0