Assorted spelling fixes.

This commit is contained in:
Frédéric Delanoy 2014-02-07 22:42:49 +01:00 committed by Alexandre Julliard
parent ee49a5a273
commit 0f2bed51bd
57 changed files with 117 additions and 117 deletions

View File

@ -2716,7 +2716,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
} }
/* Check for value existence and correctness of it's type, allocate a buffer and load it. */ /* Check for value existence and correctness of its type, allocate a buffer and load it. */
result = RegQueryValueExW(hKey, pwszValue, NULL, &dwValueType, NULL, &cbData); result = RegQueryValueExW(hKey, pwszValue, NULL, &dwValueType, NULL, &cbData);
if (result != ERROR_SUCCESS) goto cleanup; if (result != ERROR_SUCCESS) goto cleanup;
if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) { if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) {

View File

@ -931,7 +931,7 @@ static void test_set_provider_ex(void)
LocalFree(pszProvName); LocalFree(pszProvName);
reset: reset:
/* Set the provider back to it's original */ /* Set the provider back to its original */
result = pCryptSetProviderExA(curProvName, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT); result = pCryptSetProviderExA(curProvName, PROV_RSA_FULL, NULL, CRYPT_MACHINE_DEFAULT);
ok(result, "%d\n", GetLastError()); ok(result, "%d\n", GetLastError());
LocalFree(curProvName); LocalFree(curProvName);

View File

@ -996,7 +996,7 @@ static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs)
} }
/* Native version of ComboEx creates the ComboBox with DROPDOWNLIST */ /* Native version of ComboEx creates the ComboBox with DROPDOWNLIST */
/* specified. It then creates it's own version of the EDIT control */ /* specified. It then creates its own version of the EDIT control */
/* and makes the ComboBox the parent. This is because a normal */ /* and makes the ComboBox the parent. This is because a normal */
/* DROPDOWNLIST does not have an EDIT control, but we need one. */ /* DROPDOWNLIST does not have an EDIT control, but we need one. */
/* We also need to place the edit control at the proper location */ /* We also need to place the edit control at the proper location */

View File

@ -467,7 +467,7 @@ BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow)
* *
* NOTES * NOTES
* - If the 'hdpaNew' is a NULL-Pointer, a copy of the source pointer * - If the 'hdpaNew' is a NULL-Pointer, a copy of the source pointer
* array will be created and it's handle (pointer) is returned. * array will be created and its handle (pointer) is returned.
* - If 'hdpa' is a NULL-Pointer, the original implementation crashes, * - If 'hdpa' is a NULL-Pointer, the original implementation crashes,
* this implementation just returns NULL. * this implementation just returns NULL.
*/ */

View File

@ -4146,7 +4146,7 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave)
{ {
/* separator */ /* separator */
nmtbr.tbButton.fsStyle = TBSTYLE_SEP; nmtbr.tbButton.fsStyle = TBSTYLE_SEP;
/* when inserting separators, iBitmap controls it's size. /* when inserting separators, iBitmap controls its size.
0 sets default size (width) */ 0 sets default size (width) */
nmtbr.tbButton.iBitmap = 0; nmtbr.tbButton.iBitmap = 0;
} }

View File

@ -277,7 +277,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8
} }
if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { if (NULL != ppDirectMusic && NULL != *ppDirectMusic) {
/* app creates it's own dmusic object and gives it to performance */ /* app creates its own dmusic object and gives it to performance */
This->pDirectMusic = (IDirectMusic8*) *ppDirectMusic; This->pDirectMusic = (IDirectMusic8*) *ppDirectMusic;
IDirectMusic8_AddRef(This->pDirectMusic); IDirectMusic8_AddRef(This->pDirectMusic);
} else { } else {
@ -1228,9 +1228,9 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj)
InitializeCriticalSection(&obj->safe); InitializeCriticalSection(&obj->safe);
obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe"); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe");
obj->rtLatencyTime = 100; /* 100ms TO FIX */ obj->rtLatencyTime = 100; /* 100 ms TO FIX */
obj->dwBumperLength = 50; /* 50ms default */ obj->dwBumperLength = 50; /* 50 ms default */
obj->dwPrepareTime = 1000; /* 1000ms default */ obj->dwPrepareTime = 1000; /* 1000 ms default */
return IDirectMusicPerformance8Impl_QueryInterface(&obj->IDirectMusicPerformance8_iface, return IDirectMusicPerformance8Impl_QueryInterface(&obj->IDirectMusicPerformance8_iface,
lpcGUID, ppobj); lpcGUID, ppobj);
} }

View File

@ -530,7 +530,7 @@ static HRESULT GAMEUX_RemoveRegistryRecord(GUID* pInstanceID)
* sGDFBinaryPath [I] path to binary containing GDF file in * sGDFBinaryPath [I] path to binary containing GDF file in
* resources * resources
* sGameInstallDirectory [I] path to directory, where game installed * sGameInstallDirectory [I] path to directory, where game installed
* it's files. * its files.
* installScope [I] scope of game installation * installScope [I] scope of game installation
* pInstanceID [I/O] pointer to game instance identifier. * pInstanceID [I/O] pointer to game instance identifier.
* If pointing to GUID_NULL, then new * If pointing to GUID_NULL, then new
@ -704,7 +704,7 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) {
{ {
WCHAR *lpGameInstallDirectory = NULL; WCHAR *lpGameInstallDirectory = NULL;
/* game found, it's registry path is in lpRegistryPath and install /* game found, its registry path is in lpRegistryPath and install
* scope in installScope */ * scope in installScope */
TRACE("game found in registry (path %s), updating\n", debugstr_w(lpRegistryPath)); TRACE("game found in registry (path %s), updating\n", debugstr_w(lpRegistryPath));

View File

@ -387,7 +387,7 @@ static HRESULT GAMEUX_getAppIdFromGDFPath(
hr = E_FAIL; hr = E_FAIL;
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
/* game is registered, let's read it's application id from registry */ /* game is registered, let's read its application id from registry */
hr = GAMEUX_buildGameRegistryPath(installScope, &instanceId, &lpRegistryPath); hr = GAMEUX_buildGameRegistryPath(installScope, &instanceId, &lpRegistryPath);
if(SUCCEEDED(hr)) { if(SUCCEEDED(hr)) {

View File

@ -363,7 +363,7 @@ static void _validateGameRegistryKey(int line,
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
if(presenceExpected) if(presenceExpected)
/* if the key exists and we expected it, let's verify it's content */ /* if the key exists and we expected it, let's verify its content */
_validateGameRegistryValues(line, hKey, lpRegistryPath, gameApplicationId, gameExePath, gameExeName); _validateGameRegistryValues(line, hKey, lpRegistryPath, gameApplicationId, gameExePath, gameExeName);
RegCloseKey(hKey); RegCloseKey(hKey);

View File

@ -2230,7 +2230,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
* This function behaves differently in Win9x and WinNT. * This function behaves differently in Win9x and WinNT.
* *
* In WinNT, the DC's world transform is updated as the EMF changes * In WinNT, the DC's world transform is updated as the EMF changes
* the Window/Viewport Extent and Origin or it's world transform. * the Window/Viewport Extent and Origin or its world transform.
* The actual Window/Viewport Extent and Origin are left untouched. * The actual Window/Viewport Extent and Origin are left untouched.
* *
* In Win9x, the DC is left untouched, and PlayEnhMetaFileRecord * In Win9x, the DC is left untouched, and PlayEnhMetaFileRecord

View File

@ -890,7 +890,7 @@ ProcessOp(CompilerState *state, REOpData *opData, RENode **operandStack,
/* /*
* Hack two bits in CompilerState.flags, for use within FindParenCount to flag * Hack two bits in CompilerState.flags, for use within FindParenCount to flag
* its being on the stack, and to propagate errors to its callers. * it being on the stack, and to propagate errors to its callers.
*/ */
#define JSREG_FIND_PAREN_COUNT 0x8000 #define JSREG_FIND_PAREN_COUNT 0x8000
#define JSREG_FIND_PAREN_ERROR 0x4000 #define JSREG_FIND_PAREN_ERROR 0x4000

View File

@ -93,7 +93,7 @@ static void test_Heap(void)
error=TRUE; error=TRUE;
} }
} }
ok(!error,"HeapAlloc should have zeroed out it's allocated memory\n"); ok(!error,"HeapAlloc should have zeroed out its allocated memory\n");
} }
/* Check that HeapAlloc returns NULL when requested way too much memory */ /* Check that HeapAlloc returns NULL when requested way too much memory */
@ -114,7 +114,7 @@ static void test_Heap(void)
error=TRUE; error=TRUE;
} }
} }
ok(!error,"HeapReAlloc should have zeroed out it's allocated memory\n"); ok(!error,"HeapReAlloc should have zeroed out its allocated memory\n");
} }
/* Check that HeapRealloc honours HEAP_REALLOC_IN_PLACE_ONLY */ /* Check that HeapRealloc honours HEAP_REALLOC_IN_PLACE_ONLY */
@ -195,7 +195,7 @@ static void test_Global(void)
error=TRUE; error=TRUE;
} }
} }
ok(!error,"GlobalAlloc should have zeroed out it's allocated memory\n"); ok(!error,"GlobalAlloc should have zeroed out its allocated memory\n");
} }
} }
/* Check that GlobalReAlloc works */ /* Check that GlobalReAlloc works */
@ -222,7 +222,7 @@ static void test_Global(void)
error=TRUE; error=TRUE;
} }
} }
ok(!error,"GlobalReAlloc should have zeroed out it's allocated memory\n"); ok(!error,"GlobalReAlloc should have zeroed out its allocated memory\n");
/* Check that GlobalHandle works */ /* Check that GlobalHandle works */
mem2b=GlobalHandle(mem2ptr); mem2b=GlobalHandle(mem2ptr);
@ -287,7 +287,7 @@ static void test_Local(void)
error=TRUE; error=TRUE;
} }
} }
ok(!error,"LocalAlloc should have zeroed out it's allocated memory\n"); ok(!error,"LocalAlloc should have zeroed out its allocated memory\n");
SetLastError(0); SetLastError(0);
error=LocalUnlock(mem2); error=LocalUnlock(mem2);
ok(!error && GetLastError()==NO_ERROR, ok(!error && GetLastError()==NO_ERROR,
@ -315,7 +315,7 @@ static void test_Local(void)
error=TRUE; error=TRUE;
} }
} }
ok(!error,"LocalReAlloc should have zeroed out it's allocated memory\n"); ok(!error,"LocalReAlloc should have zeroed out its allocated memory\n");
/* Check that LocalHandle works */ /* Check that LocalHandle works */
mem2b=LocalHandle(mem2ptr); mem2b=LocalHandle(mem2ptr);
ok(mem2b==mem2a,"LocalHandle didn't return the correct memory handle\n"); ok(mem2b==mem2a,"LocalHandle didn't return the correct memory handle\n");

View File

@ -308,7 +308,7 @@ static void test_setdir(CHAR *olddir,CHAR *newdir,
"%s: SetCurrentDirectory did not change the directory, though it passed\n", "%s: SetCurrentDirectory did not change the directory, though it passed\n",
errstr); errstr);
ok(SetCurrentDirectoryA(olddir), ok(SetCurrentDirectoryA(olddir),
"%s: Couldn't set directory to it's original value\n",errstr); "%s: Couldn't set directory to its original value\n",errstr);
} else { } else {
/* else thest that it fails correctly */ /* else thest that it fails correctly */
chklen=lstrlenA(olddir); chklen=lstrlenA(olddir);

View File

@ -1412,11 +1412,11 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu
* [0, >=1, >=1] above we cannot add additional waiting threads to the * [0, >=1, >=1] above we cannot add additional waiting threads to the
* shared access queue - it wouldn't be possible to distinguish waiting * shared access queue - it wouldn't be possible to distinguish waiting
* threads and those that are still inside. To solve this problem the lock * threads and those that are still inside. To solve this problem the lock
* uses the following approach: A thread that isn't able to allocate a * uses the following approach: a thread that isn't able to allocate a
* shared lock just uses the exclusive queue instead. As soon as the thread * shared lock just uses the exclusive queue instead. As soon as the thread
* is woken up it is in the state [1, >=1, >=0]. In this state its again * is woken up it is in the state [1, >=1, >=0]. In this state it's again
* possible to use the shared access queue. The thread atomically moves * possible to use the shared access queue. The thread atomically moves
* itself to the shared access queue and releases the exclusive lock, such * itself to the shared access queue and releases the exclusive lock, so
* that the "real" exclusive access threads have a chance. As soon as they * that the "real" exclusive access threads have a chance. As soon as they
* are all ready the shared access threads are processed. * are all ready the shared access threads are processed.
*/ */
@ -1449,7 +1449,7 @@ static inline unsigned int srwlock_lock_exclusive( unsigned int *dest, int incr
/* Atomically modifies the value of *dest by adding incr. If the shared /* Atomically modifies the value of *dest by adding incr. If the shared
* queue is empty and there are threads waiting for exclusive access, then * queue is empty and there are threads waiting for exclusive access, then
* sets the mark SRWLOCK_MASK_IN_EXCLUSIVE to signal other threads that * sets the mark SRWLOCK_MASK_IN_EXCLUSIVE to signal other threads that
* they are allowed to use again the shared queue counter. */ * they are allowed again to use the shared queue counter. */
for (val = *dest;; val = tmp) for (val = *dest;; val = tmp)
{ {
tmp = val + incr; tmp = val + incr;
@ -1484,7 +1484,7 @@ static inline unsigned int srwlock_unlock_exclusive( unsigned int *dest, int inc
static inline void srwlock_leave_exclusive( RTL_SRWLOCK *lock, unsigned int val ) static inline void srwlock_leave_exclusive( RTL_SRWLOCK *lock, unsigned int val )
{ {
/* Used when a thread leaves an exclusive section. If there are other /* Used when a thread leaves an exclusive section. If there are other
* exclusive access threads they are processed first, afterwards process * exclusive access threads they are processed first, followed by
* the shared waiters. */ * the shared waiters. */
if (val & SRWLOCK_MASK_EXCLUSIVE_QUEUE) if (val & SRWLOCK_MASK_EXCLUSIVE_QUEUE)
NtReleaseKeyedEvent( keyed_event, srwlock_key_exclusive(lock), FALSE, NULL ); NtReleaseKeyedEvent( keyed_event, srwlock_key_exclusive(lock), FALSE, NULL );

View File

@ -1726,7 +1726,7 @@ START_TEST(info)
trace("Starting test_process_debug_flags()\n"); trace("Starting test_process_debug_flags()\n");
test_query_process_debug_flags(argc, argv); test_query_process_debug_flags(argc, argv);
/* belongs into it's own file */ /* belongs to its own file */
trace("Starting test_readvirtualmemory()\n"); trace("Starting test_readvirtualmemory()\n");
test_readvirtualmemory(); test_readvirtualmemory();

View File

@ -37,7 +37,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
#define BLOCK_TAB_SIZE 5 /* represent the first size table and it's increment block size */ #define BLOCK_TAB_SIZE 5 /* represent the first size table and its increment block size */
/* CompositeMoniker data structure */ /* CompositeMoniker data structure */
typedef struct CompositeMonikerImpl{ typedef struct CompositeMonikerImpl{

View File

@ -56,7 +56,7 @@ WINE_DECLARE_DEBUG_CHANNEL(accel);
/****************************************************************************** /******************************************************************************
* These are static/global variables and internal data structures that the * These are static/global variables and internal data structures that the
* OLE module uses to maintain it's state. * OLE module uses to maintain its state.
*/ */
typedef struct tagTrackerWindowInfo typedef struct tagTrackerWindowInfo
{ {
@ -1332,7 +1332,7 @@ HRESULT WINAPI OleLoad(
if (SUCCEEDED(hres) && pClientSite) if (SUCCEEDED(hres) && pClientSite)
/* /*
* Inform the new object of it's client site. * Inform the new object of its client site.
*/ */
hres = IOleObject_SetClientSite(pOleObject, pClientSite); hres = IOleObject_SetClientSite(pOleObject, pClientSite);
@ -2441,7 +2441,7 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo)
/* /*
* If the source told us that we should cancel, fool the drop * If the source told us that we should cancel, fool the drop
* target by telling it that the mouse left it's window. * target by telling it that the mouse left its window.
* Also set the drop effect to "NONE" in case the application * Also set the drop effect to "NONE" in case the application
* ignores the result of DoDragDrop. * ignores the result of DoDragDrop.
*/ */

View File

@ -173,7 +173,7 @@ cl_context WINAPI wine_clCreateContext(const cl_context_properties * properties,
/* FIXME: The CONTEXT_CALLBACK structure is currently leaked. /* FIXME: The CONTEXT_CALLBACK structure is currently leaked.
* Pointers to callback redirectors should be remembered and free()d when the context is destroyed. * Pointers to callback redirectors should be remembered and free()d when the context is destroyed.
* The problem is determining when a context is being destroyed. clReleaseContext only decrements * The problem is determining when a context is being destroyed. clReleaseContext only decrements
* the use count for a context, it's destruction can come much later and therefore there is a risk * the use count for a context, its destruction can come much later and therefore there is a risk
* that the callback could be invoked after the user_data memory has been free()d. * that the callback could be invoked after the user_data memory has been free()d.
*/ */
ccb = HeapAlloc(GetProcessHeap(), 0, sizeof(CONTEXT_CALLBACK)); ccb = HeapAlloc(GetProcessHeap(), 0, sizeof(CONTEXT_CALLBACK));
@ -194,7 +194,7 @@ cl_context WINAPI wine_clCreateContextFromType(const cl_context_properties * pro
/* FIXME: The CONTEXT_CALLBACK structure is currently leaked. /* FIXME: The CONTEXT_CALLBACK structure is currently leaked.
* Pointers to callback redirectors should be remembered and free()d when the context is destroyed. * Pointers to callback redirectors should be remembered and free()d when the context is destroyed.
* The problem is determining when a context is being destroyed. clReleaseContext only decrements * The problem is determining when a context is being destroyed. clReleaseContext only decrements
* the use count for a context, it's destruction can come much later and therefore there is a risk * the use count for a context, its destruction can come much later and therefore there is a risk
* that the callback could be invoked after the user_data memory has been free()d. * that the callback could be invoked after the user_data memory has been free()d.
*/ */
ccb = HeapAlloc(GetProcessHeap(), 0, sizeof(CONTEXT_CALLBACK)); ccb = HeapAlloc(GetProcessHeap(), 0, sizeof(CONTEXT_CALLBACK));

View File

@ -265,7 +265,7 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const
ALLOCATOR_PROPERTIES props; ALLOCATOR_PROPERTIES props;
props.cBuffers = 3; props.cBuffers = 3;
props.cbBuffer = 64 * 1024; /* 64k bytes */ props.cbBuffer = 64 * 1024; /* 64 KB */
props.cbAlign = 1; props.cbAlign = 1;
props.cbPrefix = 0; props.cbPrefix = 0;
@ -598,7 +598,7 @@ static HRESULT PullPin_InitProcessing(PullPin * This)
assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT);
This->state = Req_Sleepy; This->state = Req_Sleepy;
/* AddRef the filter to make sure it and it's pins will be around /* AddRef the filter to make sure it and its pins will be around
* as long as the thread */ * as long as the thread */
IBaseFilter_AddRef(This->pin.pinInfo.pFilter); IBaseFilter_AddRef(This->pin.pinInfo.pFilter);

View File

@ -34,7 +34,7 @@
* *
* Richedit version 4.1: * Richedit version 4.1:
* Tables are implemented such that cells can contain multiple paragraphs, * Tables are implemented such that cells can contain multiple paragraphs,
* each with it's own paragraph format, and cells may even contain tables * each with its own paragraph format, and cells may even contain tables
* nested within the cell. * nested within the cell.
* *
* There is also a paragraph at the start of each table row that contains * There is also a paragraph at the start of each table row that contains

View File

@ -1387,7 +1387,7 @@ static int mp_lshd (mp_int * a, int b)
{ {
int x, res; int x, res;
/* if its less than zero return */ /* if it's less than zero return */
if (b <= 0) { if (b <= 0) {
return MP_OKAY; return MP_OKAY;
} }
@ -1624,7 +1624,7 @@ static int mp_div (const mp_int * a, const mp_int * b, mp_int * c, mp_int * d)
norm = 0; norm = 0;
} }
/* note hac does 0 based, so if used==5 then its 0,1,2,3,4, e.g. use 4 */ /* note hac does 0 based, so if used==5 then it's 0,1,2,3,4, e.g. use 4 */
n = x.used - 1; n = x.used - 1;
t = y.used - 1; t = y.used - 1;
@ -2536,7 +2536,7 @@ top:
goto __ERR; goto __ERR;
} }
/* if its too low */ /* if it's too low */
while (mp_cmp_d(&C, 0) == MP_LT) { while (mp_cmp_d(&C, 0) == MP_LT) {
if ((res = mp_add(&C, b, &C)) != MP_OKAY) { if ((res = mp_add(&C, b, &C)) != MP_OKAY) {
goto __ERR; goto __ERR;
@ -2821,13 +2821,13 @@ int mp_lcm (const mp_int * a, const mp_int * b, mp_int * c)
/* divide the smallest by the GCD */ /* divide the smallest by the GCD */
if (mp_cmp_mag(a, b) == MP_LT) { if (mp_cmp_mag(a, b) == MP_LT) {
/* store quotient in t2 such that t2 * b is the LCM */ /* store quotient in t2 so that t2 * b is the LCM */
if ((res = mp_div(a, &t1, &t2, NULL)) != MP_OKAY) { if ((res = mp_div(a, &t1, &t2, NULL)) != MP_OKAY) {
goto __T; goto __T;
} }
res = mp_mul(b, &t2, c); res = mp_mul(b, &t2, c);
} else { } else {
/* store quotient in t2 such that t2 * a is the LCM */ /* store quotient in t2 so that t2 * a is the LCM */
if ((res = mp_div(b, &t1, &t2, NULL)) != MP_OKAY) { if ((res = mp_div(b, &t1, &t2, NULL)) != MP_OKAY) {
goto __T; goto __T;
} }

View File

@ -188,8 +188,8 @@ static BOOL init_aes_environment(void)
hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE;
/* we are using NULL as provider name for RSA_AES provider as the provider /* we are using NULL as provider name for RSA_AES provider as the provider
* names are different in Windows XP and Vista. Its different as to what * names are different in Windows XP and Vista. It's different to what
* its defined in the SDK on Windows XP. * is defined in the SDK on Windows XP.
* This provider is available on Windows XP, Windows 2003 and Vista. */ * This provider is available on Windows XP, Windows 2003 and Vista. */
result = CryptAcquireContextA(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT); result = CryptAcquireContextA(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT);

View File

@ -206,7 +206,7 @@ static void test_ShortcutFolder(void) {
IShellFolder_Release(pWineTestFolder); IShellFolder_Release(pWineTestFolder);
if (FAILED(hr)) goto cleanup; if (FAILED(hr)) goto cleanup;
/* The resulting folder object has the FolderShortcut CLSID, instead of it's own. */ /* The resulting folder object has the FolderShortcut CLSID, instead of its own. */
hr = IPersistFolder3_GetClassID(pWineTestPersistFolder, &clsid); hr = IPersistFolder3_GetClassID(pWineTestPersistFolder, &clsid);
ok (SUCCEEDED(hr), "IPersist::GetClassID failed! hr = %08x\n", hr); ok (SUCCEEDED(hr), "IPersist::GetClassID failed! hr = %08x\n", hr);
ok (IsEqualCLSID(&CLSID_FolderShortcut, &clsid), "GetClassId returned wrong CLSID!\n"); ok (IsEqualCLSID(&CLSID_FolderShortcut, &clsid), "GetClassId returned wrong CLSID!\n");

View File

@ -313,7 +313,7 @@ static void GetNormalAndSelectedIcons(LPITEMIDLIST lpifq, LPTVITEMW lpTV_ITEM)
/****************************************************************************** /******************************************************************************
* GetName [Internal] * GetName [Internal]
* *
* Query a shell folder for the display name of one of it's children * Query a shell folder for the display name of one of its children
* *
* PARAMS * PARAMS
* lpsf [I] IShellFolder interface of the folder to be queried. * lpsf [I] IShellFolder interface of the folder to be queried.
@ -901,7 +901,7 @@ static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection,
if (_ILIsEqualSimple(pItemData->lpi, pidlCurrent)) { if (_ILIsEqualSimple(pItemData->lpi, pidlCurrent)) {
pidlCurrent = ILGetNext(pidlCurrent); pidlCurrent = ILGetNext(pidlCurrent);
if (!_ILIsEmpty(pidlCurrent)) { if (!_ILIsEmpty(pidlCurrent)) {
/* Only expand current node and move on to it's first child, /* Only expand current node and move on to its first child,
* if we didn't already reach the last SHITEMID */ * if we didn't already reach the last SHITEMID */
SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item.hItem); SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item.hItem);
item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD, item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD,

View File

@ -58,7 +58,7 @@
* Since the user prefers to be presented the good-old DOS file-names instead of * Since the user prefers to be presented the good-old DOS file-names instead of
* binary ITEMIDLISTs, a translation method between string-based file-names and * binary ITEMIDLISTs, a translation method between string-based file-names and
* ITEMIDLISTs was established. At the core of this are the COM-Interface * ITEMIDLISTs was established. At the core of this are the COM-Interface
* IShellFolder and especially it's methods ParseDisplayName and * IShellFolder and especially its methods ParseDisplayName and
* GetDisplayNameOf. Basically, you give a DOS-path (let's say C:\windows) to * GetDisplayNameOf. Basically, you give a DOS-path (let's say C:\windows) to
* ParseDisplayName and get a SHITEMID similar to <Desktop|My Computer|C:|windows|>. * ParseDisplayName and get a SHITEMID similar to <Desktop|My Computer|C:|windows|>.
* Since it's opaque, you can't see the 'C', the 'windows' and the other stuff. * Since it's opaque, you can't see the 'C', the 'windows' and the other stuff.
@ -80,7 +80,7 @@
* in the filesystem. The 'My Computer' shell folder object is one instance * in the filesystem. The 'My Computer' shell folder object is one instance
* which comes to mind (Go try to save a file into 'My Computer' on windows.) * which comes to mind (Go try to save a file into 'My Computer' on windows.)
* So, to make matters a little more complex, before the file dialog asks a * So, to make matters a little more complex, before the file dialog asks a
* shell namespace object for it's DOS path, it asks if it actually has one. * shell namespace object for its DOS path, it asks if it actually has one.
* This is done via the IShellFolder::GetAttributesOf method, which sets the * This is done via the IShellFolder::GetAttributesOf method, which sets the
* SFGAO_FILESYSTEM if - and only if - it has. * SFGAO_FILESYSTEM if - and only if - it has.
* *

View File

@ -2243,7 +2243,7 @@ static void test_knownFolders(void)
ok(lstrcmpiW(folderPath, sExample2Path)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExample2Path)); ok(lstrcmpiW(folderPath, sExample2Path)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExample2Path));
CoTaskMemFree(folderPath); CoTaskMemFree(folderPath);
/* verify sub folder - it should fail now, as we redirected it's parent folder, but we have no sub folder in new location */ /* verify sub folder - it should fail now, as we redirected its parent folder, but we have no sub folder in new location */
hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); hr = IKnownFolder_GetPath(subFolder, 0, &folderPath);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "unexpected value from GetPath(): 0x%08x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "unexpected value from GetPath(): 0x%08x\n", hr);
ok(folderPath==NULL, "invalid known folder path retrieved: \"%s\" when NULL pointer was expected\n", wine_dbgstr_w(folderPath)); ok(folderPath==NULL, "invalid known folder path retrieved: \"%s\" when NULL pointer was expected\n", wine_dbgstr_w(folderPath));

View File

@ -1507,7 +1507,7 @@ static void test_PathUnExpandEnvStrings(void)
ok(!strncmp(buff, sysrootA, sizeof(sysrootA)-1), "wrong return string %s\n", buff); ok(!strncmp(buff, sysrootA, sizeof(sysrootA)-1), "wrong return string %s\n", buff);
/* expanded value occurs multiple times */ /* expanded value occurs multiple times */
/* for drive C: it's unexpands it like 'C:C:' -> '%SystemDrive%C:' */ /* for drive C: it unexpands it like 'C:C:' -> '%SystemDrive%C:' */
buff[0] = 0; buff[0] = 0;
strcpy(path, sysdrvA); strcpy(path, sysdrvA);
strcat(path, sysdrvA); strcat(path, sysdrvA);
@ -1573,7 +1573,7 @@ static void test_PathUnExpandEnvStrings(void)
ok(!memcmp(buffW, sysrootW, sizeof(sysrootW) - sizeof(WCHAR)), "wrong return string %s\n", wine_dbgstr_w(buffW)); ok(!memcmp(buffW, sysrootW, sizeof(sysrootW) - sizeof(WCHAR)), "wrong return string %s\n", wine_dbgstr_w(buffW));
/* expanded value occurs multiple times */ /* expanded value occurs multiple times */
/* for drive C: it's unexpands it like 'C:C:' -> '%SystemDrive%C:' */ /* for drive C: it unexpands it like 'C:C:' -> '%SystemDrive%C:' */
buffW[0] = 0; buffW[0] = 0;
lstrcpyW(pathW, sysdrvW); lstrcpyW(pathW, sysdrvW);
lstrcatW(pathW, sysdrvW); lstrcatW(pathW, sysdrvW);

View File

@ -294,7 +294,7 @@ static BOOL get_zone_for_scheme(HKEY key, LPCWSTR schema, DWORD *zone)
* search_domain_for_zone [internal] * search_domain_for_zone [internal]
* *
* Searches the specified 'domain' registry key to see if 'host' maps into it, or any * Searches the specified 'domain' registry key to see if 'host' maps into it, or any
* of it's subdomain registry keys. * of its subdomain registry keys.
* *
* Returns S_OK if a match is found, S_FALSE if no matches were found, or an error code. * Returns S_OK if a match is found, S_FALSE if no matches were found, or an error code.
*/ */
@ -386,7 +386,7 @@ static HRESULT search_domain_for_zone(HKEY domains, LPCWSTR domain, DWORD domain
/* There's a chance that 'host' implicitly mapped into 'domain', in /* There's a chance that 'host' implicitly mapped into 'domain', in
* which case we check to see if 'domain' contains zone information. * which case we check to see if 'domain' contains zone information.
* *
* This can only happen if 'domain' is it's own domain name. * This can only happen if 'domain' is its own domain name.
* Example: * Example:
* "google.com" (domain name = "google.com") * "google.com" (domain name = "google.com")
* *
@ -395,7 +395,7 @@ static HRESULT search_domain_for_zone(HKEY domains, LPCWSTR domain, DWORD domain
* *
* Then host would map directly into the "google.com" domain key. * Then host would map directly into the "google.com" domain key.
* *
* If 'domain' has more than just it's domain name, or it does not * If 'domain' has more than just its domain name, or it does not
* have a domain name, then we don't perform the check. The reason * have a domain name, then we don't perform the check. The reason
* for this is that these domains don't allow implicit mappings. * for this is that these domains don't allow implicit mappings.
* Example: * Example:

View File

@ -730,7 +730,7 @@ typedef struct {
static const zone_domain_mapping zone_domain_mappings[] = { static const zone_domain_mapping zone_domain_mappings[] = {
/* Implicitly means "*.yabadaba.do". */ /* Implicitly means "*.yabadaba.do". */
{"yabadaba.do",NULL,"http",URLZONE_CUSTOM}, {"yabadaba.do",NULL,"http",URLZONE_CUSTOM},
/* The '*' doesn't count as a wildcard, since its not the first component of the subdomain. */ /* The '*' doesn't count as a wildcard, since it's not the first component of the subdomain. */
{"super.cool","testing.*","ftp",URLZONE_CUSTOM2}, {"super.cool","testing.*","ftp",URLZONE_CUSTOM2},
/* The '*' counts since it's the first component of the subdomain. */ /* The '*' counts since it's the first component of the subdomain. */
{"super.cool","*.testing","ftp",URLZONE_CUSTOM2}, {"super.cool","*.testing","ftp",URLZONE_CUSTOM2},

View File

@ -688,7 +688,7 @@ static const uri_properties uri_tests[] = {
{URLZONE_INVALID,E_NOTIMPL,FALSE} {URLZONE_INVALID,E_NOTIMPL,FALSE}
} }
}, },
/* URI is considered opaque since CREATE_NO_CRACK_UNKNOWN_SCHEMES is set and its an unknown scheme. */ /* URI is considered opaque since CREATE_NO_CRACK_UNKNOWN_SCHEMES is set and it's an unknown scheme. */
{ "zip://google.com", Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES, S_OK, FALSE, { "zip://google.com", Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES, S_OK, FALSE,
{ {
{"zip:/.//google.com",S_OK,FALSE}, {"zip:/.//google.com",S_OK,FALSE},
@ -896,7 +896,7 @@ static const uri_properties uri_tests[] = {
{URLZONE_INVALID,E_NOTIMPL,FALSE} {URLZONE_INVALID,E_NOTIMPL,FALSE}
} }
}, },
/* Allowed to have invalid % encoded because its an unknown scheme type. */ /* Allowed to have invalid % encoded because it's an unknown scheme type. */
{ "zip://%xy:word@winehq.org/", 0, S_OK, FALSE, { "zip://%xy:word@winehq.org/", 0, S_OK, FALSE,
{ {
{"zip://%xy:word@winehq.org/",S_OK,FALSE}, {"zip://%xy:word@winehq.org/",S_OK,FALSE},
@ -1927,7 +1927,7 @@ static const uri_properties uri_tests[] = {
{URLZONE_INVALID,E_NOTIMPL,FALSE} {URLZONE_INVALID,E_NOTIMPL,FALSE}
} }
}, },
/* Since foo isn't a recognized 3 character TLD its considered the domain name. */ /* Since foo isn't a recognized 3 character TLD it's considered the domain name. */
{ "http://google.foo.uk", 0, S_OK, FALSE, { "http://google.foo.uk", 0, S_OK, FALSE,
{ {
{"http://google.foo.uk/",S_OK,FALSE}, {"http://google.foo.uk/",S_OK,FALSE},
@ -4071,7 +4071,7 @@ static const uri_properties uri_tests[] = {
{URLZONE_INVALID,E_NOTIMPL,FALSE} {URLZONE_INVALID,E_NOTIMPL,FALSE}
} }
}, },
/* Res doesn't get forbidden characters percent encoded in it's path. */ /* Res doesn't get forbidden characters percent encoded in its path. */
{ "res://c:\\test/tes<|>t", 0, S_OK, FALSE, { "res://c:\\test/tes<|>t", 0, S_OK, FALSE,
{ {
{"res://c:\\test/tes<|>t",S_OK,FALSE}, {"res://c:\\test/tes<|>t",S_OK,FALSE},
@ -9947,7 +9947,7 @@ static void test_IUriBuilder_HasBeenModified(void) {
hr = IUriBuilder_SetIUri(builder, uri); hr = IUriBuilder_SetIUri(builder, uri);
ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK);
/* IUriBuilder already had 'uri' as it's IUri property and so Windows doesn't /* IUriBuilder already had 'uri' as its IUri property and so Windows doesn't
* reset any of the changes that were made to the IUriBuilder. * reset any of the changes that were made to the IUriBuilder.
*/ */
hr = IUriBuilder_HasBeenModified(builder, &received); hr = IUriBuilder_HasBeenModified(builder, &received);
@ -10070,7 +10070,7 @@ static void test_IUriBuilder_IUriProperty(void) {
if(test) IUri_Release(test); if(test) IUri_Release(test);
/* Still returns the same IUri, even though the base one wasn't created with CREATE_CANONICALIZE /* Still returns the same IUri, even though the base one wasn't created with CREATE_CANONICALIZE
* explicitly set (because it's a default flags). * explicitly set (because it's a default flag).
*/ */
test = NULL; test = NULL;
hr = IUriBuilder_CreateUri(builder, Uri_CREATE_CANONICALIZE, 0, 0, &test); hr = IUriBuilder_CreateUri(builder, Uri_CREATE_CANONICALIZE, 0, 0, &test);
@ -10118,7 +10118,7 @@ static void test_IUriBuilder_IUriProperty(void) {
if(test) IUri_Release(test); if(test) IUri_Release(test);
/* Still returns the same IUri, even though the base one wasn't created with CREATE_CANONICALIZE /* Still returns the same IUri, even though the base one wasn't created with CREATE_CANONICALIZE
* explicitly set (because it's a default flags). * explicitly set (because it's a default flag).
*/ */
test = NULL; test = NULL;
hr = IUriBuilder_CreateUriWithFlags(builder, Uri_CREATE_CANONICALIZE, 0, 0, 0, &test); hr = IUriBuilder_CreateUriWithFlags(builder, Uri_CREATE_CANONICALIZE, 0, 0, 0, &test);

View File

@ -1457,7 +1457,7 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress)
DWORD status, size; DWORD status, size;
HRESULT hres, expect; HRESULT hres, expect;
/* QueryInfo changes it's behavior during this request */ /* QueryInfo changes its behavior during this request */
if(progress == BINDSTATUS_SENDINGREQUEST) if(progress == BINDSTATUS_SENDINGREQUEST)
return; return;

View File

@ -574,7 +574,7 @@ void find_domain_name(const WCHAR *host, DWORD host_len,
DWORD i; DWORD i;
/* If the sec_last_tld is 3 characters long it HAS to be on the list of /* If the sec_last_tld is 3 characters long it HAS to be on the list of
* recognized to still be considered part of the TLD name, otherwise * recognized to still be considered part of the TLD name, otherwise
* its considered the domain name. * it's considered the domain name.
* Ex: www.google.com.uk -> google.com.uk as the domain name. * Ex: www.google.com.uk -> google.com.uk as the domain name.
* www.google.foo.uk -> foo.uk as the domain name. * www.google.foo.uk -> foo.uk as the domain name.
*/ */
@ -6039,7 +6039,7 @@ static HRESULT WINAPI UriBuilder_SetIUri(IUriBuilder *iface, IUri *pIUri)
Uri *uri; Uri *uri;
if((uri = get_uri_obj(pIUri))) { if((uri = get_uri_obj(pIUri))) {
/* Only reset the builder if it's Uri isn't the same as /* Only reset the builder if its Uri isn't the same as
* the Uri passed to the function. * the Uri passed to the function.
*/ */
if(This->uri != uri) { if(This->uri != uri) {
@ -6056,7 +6056,7 @@ static HRESULT WINAPI UriBuilder_SetIUri(IUriBuilder *iface, IUri *pIUri)
return E_NOTIMPL; return E_NOTIMPL;
} }
} else if(This->uri) } else if(This->uri)
/* Only reset the builder if it's Uri isn't NULL. */ /* Only reset the builder if its Uri isn't NULL. */
reset_builder(This); reset_builder(This);
return S_OK; return S_OK;
@ -6542,7 +6542,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result,
data.path_len = proc_uri->path_len; data.path_len = proc_uri->path_len;
} else if(!data.is_opaque) { } else if(!data.is_opaque) {
/* Just set the path as a '/' if the base didn't have /* Just set the path as a '/' if the base didn't have
* one and if it's an hierarchical URI. * one and if it's a hierarchical URI.
*/ */
static const WCHAR slashW[] = {'/',0}; static const WCHAR slashW[] = {'/',0};
data.path = slashW; data.path = slashW;

View File

@ -320,7 +320,7 @@ BOOL WINAPI EmptyClipboard(void)
SendMessageW(cbinfo.hWndOwner, WM_DESTROYCLIPBOARD, 0, 0); SendMessageW(cbinfo.hWndOwner, WM_DESTROYCLIPBOARD, 0, 0);
/* Tell the driver to acquire the selection. The current owner /* Tell the driver to acquire the selection. The current owner
* will be signaled to delete it's own cache. */ * will be signaled to delete its own cache. */
/* Assign ownership of the clipboard to the current client. We do /* Assign ownership of the clipboard to the current client. We do
* this before acquiring the selection so that when we do acquire the * this before acquiring the selection so that when we do acquire the
@ -332,7 +332,7 @@ BOOL WINAPI EmptyClipboard(void)
CLIPBOARD_SetClipboardOwner(cbinfo.hWndOpen); CLIPBOARD_SetClipboardOwner(cbinfo.hWndOpen);
/* Acquire the selection. This will notify the previous owner /* Acquire the selection. This will notify the previous owner
* to clear it's cache. */ * to clear its cache. */
USER_Driver->pAcquireClipboard(cbinfo.hWndOpen); USER_Driver->pAcquireClipboard(cbinfo.hWndOpen);
/* Empty the local cache */ /* Empty the local cache */

View File

@ -1381,7 +1381,7 @@ static BOOL EDIT_MakeFit(EDITSTATE *es, UINT size)
TRACE("trying to ReAlloc to %d+1 characters\n", size); TRACE("trying to ReAlloc to %d+1 characters\n", size);
/* Force edit to unlock it's buffer. es->text now NULL */ /* Force edit to unlock its buffer. es->text now NULL */
EDIT_UnlockBuffer(es, TRUE); EDIT_UnlockBuffer(es, TRUE);
if (es->hloc32W) { if (es->hloc32W) {
@ -2599,7 +2599,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac
es->text_width = 0; es->text_width = 0;
/* Issue the EN_MAXTEXT notification and continue with replacing text /* Issue the EN_MAXTEXT notification and continue with replacing text
* such that buffer limit is honored. */ * so that buffer limit is honored. */
if ((honor_limit) && (size > es->buffer_limit)) { if ((honor_limit) && (size > es->buffer_limit)) {
EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT);
/* Buffer limit can be smaller than the actual length of text in combobox */ /* Buffer limit can be smaller than the actual length of text in combobox */

View File

@ -1885,7 +1885,7 @@ static void test_menu_search_bycommand( void )
/* Prove that you can't query the id of a popup directly (By position) */ /* Prove that you can't query the id of a popup directly (By position) */
id = GetMenuItemID(hmenu, 0); id = GetMenuItemID(hmenu, 0);
ok (id == -1, "Getting the sub menu id should have failed because its a popup (gave %x)\n", id); ok (id == -1, "Getting the sub menu id should have failed because it's a popup (gave %x)\n", id);
/* Prove getting the item info via ID returns the first item (not the popup or 2nd item)*/ /* Prove getting the item info via ID returns the first item (not the popup or 2nd item)*/
memset( &info, 0, sizeof info ); memset( &info, 0, sizeof info );

View File

@ -890,7 +890,7 @@ ProcessOp(CompilerState *state, REOpData *opData, RENode **operandStack,
/* /*
* Hack two bits in CompilerState.flags, for use within FindParenCount to flag * Hack two bits in CompilerState.flags, for use within FindParenCount to flag
* its being on the stack, and to propagate errors to its callers. * it being on the stack, and to propagate errors to its callers.
*/ */
#define JSREG_FIND_PAREN_COUNT 0x8000 #define JSREG_FIND_PAREN_COUNT 0x8000
#define JSREG_FIND_PAREN_ERROR 0x4000 #define JSREG_FIND_PAREN_ERROR 0x4000

View File

@ -603,7 +603,7 @@ static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, const char
/* DX9 cards support 40 single float varyings in hardware, most drivers report 32. ATI misreports /* DX9 cards support 40 single float varyings in hardware, most drivers report 32. ATI misreports
* 44 varyings. So assume that if we have more than 44 varyings we have a dx10 card. * 44 varyings. So assume that if we have more than 44 varyings we have a dx10 card.
* This detection is for the gl_ClipPos varying quirk. If a d3d9 card really supports more than 44 * This detection is for the gl_ClipPos varying quirk. If a d3d9 card really supports more than 44
* varyings and we subtract one in dx9 shaders its not going to hurt us because the dx9 limit is * varyings and we subtract one in dx9 shaders it's not going to hurt us because the dx9 limit is
* hardcoded * hardcoded
* *
* dx10 cards usually have 64 varyings */ * dx10 cards usually have 64 varyings */
@ -1378,7 +1378,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
} }
driver_info->device = device; driver_info->device = device;
/* Set a default amount of video memory (64MB). In general this code isn't used unless the user /* Set a default amount of video memory (64 MB). In general this code isn't used unless the user
* overrides the pci ids to a card which is not in our database. */ * overrides the pci ids to a card which is not in our database. */
driver_info->vidmem = WINE_DEFAULT_VIDMEM; driver_info->vidmem = WINE_DEFAULT_VIDMEM;
@ -1973,7 +1973,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in
return CARD_AMD_RADEON_X700; return CARD_AMD_RADEON_X700;
} }
/* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400MHz */ /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */
if (strstr(gl_renderer, "Radeon Xpress")) if (strstr(gl_renderer, "Radeon Xpress"))
{ {
return CARD_AMD_RADEON_XPRESS_200M; return CARD_AMD_RADEON_XPRESS_200M;
@ -2121,7 +2121,7 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info
{"R420", CARD_AMD_RADEON_X700}, {"R420", CARD_AMD_RADEON_X700},
{"R410", CARD_AMD_RADEON_X700}, {"R410", CARD_AMD_RADEON_X700},
{"RV410", CARD_AMD_RADEON_X700}, {"RV410", CARD_AMD_RADEON_X700},
/* Radeon Xpress - onboard, DX9b, Shader 2.0, 300-400MHz */ /* Radeon Xpress - onboard, DX9b, Shader 2.0, 300-400 MHz */
{"RS740", CARD_AMD_RADEON_XPRESS_200M}, {"RS740", CARD_AMD_RADEON_XPRESS_200M},
{"RS690", CARD_AMD_RADEON_XPRESS_200M}, {"RS690", CARD_AMD_RADEON_XPRESS_200M},
{"RS600", CARD_AMD_RADEON_XPRESS_200M}, {"RS600", CARD_AMD_RADEON_XPRESS_200M},

View File

@ -158,7 +158,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format,
wave_open_flags(CALLBACK_EVENT|flags),wave_in_error(rc)); wave_open_flags(CALLBACK_EVENT|flags),wave_in_error(rc));
if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
(flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format)) (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format))
trace(" Reason: The device lists this format as supported in it's " trace(" Reason: The device lists this format as supported in its "
"capabilities but opening it failed.\n"); "capabilities but opening it failed.\n");
if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
!(pcaps->dwFormats & format)) !(pcaps->dwFormats & format))

View File

@ -664,7 +664,7 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in
wave_open_flags(CALLBACK_EVENT|flags),wave_out_error(rc)); wave_open_flags(CALLBACK_EVENT|flags),wave_out_error(rc));
if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
(flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format)) (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format))
trace(" Reason: The device lists this format as supported in it's " trace(" Reason: The device lists this format as supported in its "
"capabilities but opening it failed.\n"); "capabilities but opening it failed.\n");
if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
!(pcaps->dwFormats & format)) !(pcaps->dwFormats & format))
@ -721,7 +721,7 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in
if (interactive && rc==MMSYSERR_NOERROR) { if (interactive && rc==MMSYSERR_NOERROR) {
trace("Playing %g second %s at %5dx%2dx%d %2d header%s %d loop%s %d bytes %s %s\n",duration, trace("Playing %g second %s at %5dx%2dx%d %2d header%s %d loop%s %d bytes %s %s\n",duration,
sine ? "440Hz tone" : "silence",pwfx->nSamplesPerSec, sine ? "440 Hz tone" : "silence", pwfx->nSamplesPerSec,
pwfx->wBitsPerSample,pwfx->nChannels, headers, headers > 1 ? "s": " ", pwfx->wBitsPerSample,pwfx->nChannels, headers, headers > 1 ? "s": " ",
loops, loops == 1 ? " " : "s", length * (loops + 1), loops, loops == 1 ? " " : "s", length * (loops + 1),
get_format_str(pwfx->wFormatTag), get_format_str(pwfx->wFormatTag),

View File

@ -230,7 +230,7 @@ error_close_key:
* *
* NOTES * NOTES
* Adding definitions is basically only adding relevant information * Adding definitions is basically only adding relevant information
* to the registry. No verification takes place whether a DLL or it's * to the registry. No verification takes place whether a DLL or its
* entrypoints exist. * entrypoints exist.
* Information in the registry will always be overwritten. * Information in the registry will always be overwritten.
* *

View File

@ -209,7 +209,7 @@ static void wpp_default_write( const char *buffer, unsigned int len ) {
fwrite(buffer, 1, len, ppy_out); fwrite(buffer, 1, len, ppy_out);
} }
/* Don't comment on the hash, its primitive but functional... */ /* Don't comment on the hash, it's primitive but functional... */
static int pphash(const char *str) static int pphash(const char *str)
{ {
int sum = 0; int sum = 0;

View File

@ -70,7 +70,7 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...)
if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0,
MAX_WRITECONSOLE_SIZE*sizeof(WCHAR)); MAX_WRITECONSOLE_SIZE*sizeof(WCHAR));
if (!output_bufW) { if (!output_bufW) {
WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); WINE_FIXME("Out of memory - could not allocate 2 x 64 KB buffers\n");
return 0; return 0;
} }
@ -84,13 +84,13 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...)
return 0; return 0;
} }
/* Try to write as unicode all the time we think its a console */ /* Try to write as unicode all the time we think it's a console */
if (toConsole) { if (toConsole) {
res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE),
output_bufW, len, &nOut, NULL); output_bufW, len, &nOut, NULL);
} }
/* If writing to console has failed (ever) we assume its file /* If writing to console has failed (ever) we assume it's file
i/o so convert to OEM codepage and output */ i/o so convert to OEM codepage and output */
if (!res) { if (!res) {
BOOL usedDefaultChar = FALSE; BOOL usedDefaultChar = FALSE;
@ -104,7 +104,7 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...)
if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0,
MAX_WRITECONSOLE_SIZE); MAX_WRITECONSOLE_SIZE);
if (!output_bufA) { if (!output_bufA) {
WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); WINE_FIXME("Out of memory - could not allocate 2 x 64 KB buffers\n");
return 0; return 0;
} }

View File

@ -770,7 +770,7 @@ void WCMD_copy(WCHAR * args) {
} }
} }
/* Calculate the destination now - if none supplied, its current dir + /* Calculate the destination now - if none supplied, it's current dir +
filename of first file in list*/ filename of first file in list*/
if (destination == NULL) { if (destination == NULL) {
@ -809,7 +809,7 @@ void WCMD_copy(WCHAR * args) {
} }
/* Normally, the destination is the current directory unless we are /* Normally, the destination is the current directory unless we are
concatenating, in which case its current directory plus first filename. concatenating, in which case it's current directory plus first filename.
Note that if the Note that if the
In addition by default it is a binary copy unless concatenating, when In addition by default it is a binary copy unless concatenating, when
the copy defaults to an ascii copy (stop at EOF). We do not know the the copy defaults to an ascii copy (stop at EOF). We do not know the
@ -1791,7 +1791,7 @@ static int WCMD_for_nexttoken(int lasttoken, WCHAR *tokenstr,
/* Get the next number */ /* Get the next number */
nextnumber1 = strtoulW(pos, &nextchar, 10); nextnumber1 = strtoulW(pos, &nextchar, 10);
/* If it is followed by a minus, its a range, so get the next one as well */ /* If it is followed by a minus, it's a range, so get the next one as well */
if (*nextchar == '-') { if (*nextchar == '-') {
nextnumber2 = strtoulW(nextchar+1, &nextchar, 10); nextnumber2 = strtoulW(nextchar+1, &nextchar, 10);
@ -3813,7 +3813,7 @@ static int WCMD_handleExpression(WCHAR **expr, int *ret, int depth)
while (*pos && (*pos==' ' || *pos=='\t')) pos++; while (*pos && (*pos==' ' || *pos=='\t')) pos++;
if (!*pos) goto exprreturn; if (!*pos) goto exprreturn;
/* If we have found anything other than an operator then its a number/variable */ /* If we have found anything other than an operator then it's a number/variable */
if (strchrW(mathDelims, *pos) == NULL) { if (strchrW(mathDelims, *pos) == NULL) {
WCHAR *parmstart, *parm, *dupparm; WCHAR *parmstart, *parm, *dupparm;
WCHAR *nextpos; WCHAR *nextpos;
@ -4002,7 +4002,7 @@ exprreturn:
goto exprerrorreturn; goto exprerrorreturn;
} }
/* Now get the number (and convert if its just a variable name) */ /* Now get the number (and convert if it's just a variable name) */
*ret = WCMD_popnumber(&varstackhead); *ret = WCMD_popnumber(&varstackhead);
exprerrorreturn: exprerrorreturn:
@ -4407,7 +4407,7 @@ void WCMD_more (WCHAR *args) {
SetStdHandle(STD_INPUT_HANDLE, hConIn); SetStdHandle(STD_INPUT_HANDLE, hConIn);
/* Warning: No easy way of ending the stream (ctrl+z on windows) so /* Warning: No easy way of ending the stream (ctrl+z on windows) so
once you get in this bit unless due to a pipe, its going to end badly... */ once you get in this bit unless due to a pipe, it's going to end badly... */
wsprintfW(moreStrPage, moreFmt, moreStr); wsprintfW(moreStrPage, moreFmt, moreStr);
WCMD_enter_paged_mode(moreStrPage); WCMD_enter_paged_mode(moreStrPage);
@ -4683,7 +4683,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) {
} else { } else {
/* Parameter supplied - if no '=' on command line, its a query */ /* Parameter supplied - if no '=' on command line, it's a query */
if (newValue == NULL) { if (newValue == NULL) {
WCHAR *space; WCHAR *space;
WCHAR subkey[MAXSTRING]; WCHAR subkey[MAXSTRING];
@ -4720,7 +4720,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) {
errorlevel = 2; errorlevel = 2;
} }
/* Not a query - its a set or clear of a value */ /* Not a query - it's a set or clear of a value */
} else { } else {
WCHAR subkey[MAXSTRING]; WCHAR subkey[MAXSTRING];

View File

@ -2233,7 +2233,7 @@ rem ******************************************************************
rem ASCII and BINARY tests rem ASCII and BINARY tests
rem Note: hard coded numbers deliberate because need to ensure whether rem Note: hard coded numbers deliberate because need to ensure whether
rem an additional EOF has been added or not. There is no way to handle rem an additional EOF has been added or not. There is no way to handle
rem EOFs in batch, so assume if a single byte appears, its an EOF! rem EOFs in batch, so assume if a single byte appears, it's an EOF!
rem ****************************************************************** rem ******************************************************************
rem Confirm original sizes of file1,2,3 rem Confirm original sizes of file1,2,3
@ -2317,7 +2317,7 @@ call :CheckFileSize file123_mixed_copy4 25
rem ------------------------------------------------------------------------------------------- rem -------------------------------------------------------------------------------------------
rem This shows when concatenating, an ascii destination always adds on an EOF but when we rem This shows when concatenating, an ascii destination always adds on an EOF but when we
rem are not concatenating, its a direct copy regardless of destination if being read as binary rem are not concatenating, it's a direct copy regardless of destination if being read as binary
rem ------------------------------------------------------------------------------------------- rem -------------------------------------------------------------------------------------------
rem All 3 have eof's, plus an extra = 6 + 9 + 12 + eof rem All 3 have eof's, plus an extra = 6 + 9 + 12 + eof

View File

@ -97,7 +97,7 @@ static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device)
/* Try to write as unicode assuming it is to a console */ /* Try to write as unicode assuming it is to a console */
res = WriteConsoleW(device, message, len, &nOut, NULL); res = WriteConsoleW(device, message, len, &nOut, NULL);
/* If writing to console fails, assume its file /* If writing to console fails, assume it's file
i/o so convert to OEM codepage and output */ i/o so convert to OEM codepage and output */
if (!res) { if (!res) {
BOOL usedDefaultChar = FALSE; BOOL usedDefaultChar = FALSE;
@ -845,7 +845,7 @@ static void handleExpansion(WCHAR *cmd, BOOL atExecute, BOOL delayed) {
wine_dbgstr_w(cmd), atExecute, wine_dbgstr_w(p)); wine_dbgstr_w(cmd), atExecute, wine_dbgstr_w(p));
i = *(p+1) - '0'; i = *(p+1) - '0';
/* Don't touch %% unless its in Batch */ /* Don't touch %% unless it's in Batch */
if (!atExecute && *(p+1) == startchar) { if (!atExecute && *(p+1) == startchar) {
if (context) { if (context) {
WCMD_strsubstW(p, p+1, NULL, 0); WCMD_strsubstW(p, p+1, NULL, 0);

View File

@ -92,7 +92,7 @@ static int __cdecl NETSTAT_wprintf(const WCHAR *format, ...)
if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0,
MAX_WRITECONSOLE_SIZE*sizeof(WCHAR)); MAX_WRITECONSOLE_SIZE*sizeof(WCHAR));
if (!output_bufW) { if (!output_bufW) {
WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); WINE_FIXME("Out of memory - could not allocate 2 x 64 KB buffers\n");
return 0; return 0;
} }
@ -100,13 +100,13 @@ static int __cdecl NETSTAT_wprintf(const WCHAR *format, ...)
len = wvsprintfW(output_bufW, format, parms); len = wvsprintfW(output_bufW, format, parms);
__ms_va_end(parms); __ms_va_end(parms);
/* Try to write as unicode all the time we think its a console */ /* Try to write as unicode all the time we think it's a console */
if (toConsole) { if (toConsole) {
res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE),
output_bufW, len, &nOut, NULL); output_bufW, len, &nOut, NULL);
} }
/* If writing to console has failed (ever) we assume its file /* If writing to console has failed (ever) we assume it's file
i/o so convert to OEM codepage and output */ i/o so convert to OEM codepage and output */
if (!res) { if (!res) {
BOOL usedDefaultChar = FALSE; BOOL usedDefaultChar = FALSE;
@ -120,7 +120,7 @@ static int __cdecl NETSTAT_wprintf(const WCHAR *format, ...)
if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0, if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0,
MAX_WRITECONSOLE_SIZE); MAX_WRITECONSOLE_SIZE);
if (!output_bufA) { if (!output_bufA) {
WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); WINE_FIXME("Out of memory - could not allocate 2 x 64 KB buffers\n");
return 0; return 0;
} }

View File

@ -286,7 +286,7 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
* Make sure they are giving the process affinity * Make sure they are giving the process affinity
* with at least one processor. I'd hate to see a * with at least one processor. I'd hate to see a
* process that is not in a wait state get deprived * process that is not in a wait state get deprived
* of it's cpu time. * of its cpu time.
*/ */
if (!dwProcessAffinityMask) { if (!dwProcessAffinityMask) {
WCHAR wszErrorMsg[255]; WCHAR wszErrorMsg[255];

View File

@ -112,7 +112,7 @@ void TaskManager_OnOptionsShow16BitTasks(void)
* FIXME: Currently this is useless because the * FIXME: Currently this is useless because the
* current implementation doesn't list the 16-bit * current implementation doesn't list the 16-bit
* processes. I believe that would require querying * processes. I believe that would require querying
* each ntvdm.exe process for it's children. * each ntvdm.exe process for its children.
*/ */
/* /*

View File

@ -59,7 +59,7 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
*/ */
/* /*
* Get the device context and save it's state * Get the device context and save its state
* to be restored after we're done * to be restored after we're done
*/ */
hDC = (HDC) wParam; hDC = (HDC) wParam;

View File

@ -1007,12 +1007,12 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
return TRUE; return TRUE;
case WM_SIZE: case WM_SIZE:
/* Handle the window sizing in it's own function */ /* Handle the window sizing in its own function */
OnSize(wParam, LOWORD(lParam), HIWORD(lParam)); OnSize(wParam, LOWORD(lParam), HIWORD(lParam));
break; break;
case WM_MOVE: case WM_MOVE:
/* Handle the window moving in it's own function */ /* Handle the window moving in its own function */
OnMove(wParam, LOWORD(lParam), HIWORD(lParam)); OnMove(wParam, LOWORD(lParam), HIWORD(lParam));
break; break;

View File

@ -42,7 +42,7 @@
#define ADDRSIZE (be_cpu->pointer_size) #define ADDRSIZE (be_cpu->pointer_size)
#define ADDRWIDTH (ADDRSIZE * 2) #define ADDRWIDTH (ADDRSIZE * 2)
/* the debugger uses these exceptions for it's internal use */ /* the debugger uses these exceptions for its internal use */
#define DEBUG_STATUS_OFFSET 0x80003000 #define DEBUG_STATUS_OFFSET 0x80003000
#define DEBUG_STATUS_INTERNAL_ERROR (DEBUG_STATUS_OFFSET+0) /* something went wrong */ #define DEBUG_STATUS_INTERNAL_ERROR (DEBUG_STATUS_OFFSET+0) /* something went wrong */
#define DEBUG_STATUS_NO_SYMBOL (DEBUG_STATUS_OFFSET+1) /* no symbol found in lookup */ #define DEBUG_STATUS_NO_SYMBOL (DEBUG_STATUS_OFFSET+1) /* no symbol found in lookup */

View File

@ -245,7 +245,7 @@ sub process_source_file($)
}; };
my $parse_state = 0; my $parse_state = 0;
my $ignore_blank_lines = 1; my $ignore_blank_lines = 1;
my $extra_comment = 0; # 1 if this is an extra comment, i.e its not a .spec export my $extra_comment = 0; # 1 if this is an extra comment, i.e it's not a .spec export
if ($opt_verbose > 0) if ($opt_verbose > 0)
{ {
@ -763,7 +763,7 @@ sub process_comment($)
if ($comment->{COMMENT_NAME} =~ /W$/ ) if ($comment->{COMMENT_NAME} =~ /W$/ )
{ {
# This is probably a Unicode version of an Ascii function. # This is probably a Unicode version of an Ascii function.
# Create the Ascii name and see if its been documented # Create the Ascii name and see if it has been documented
my $ascii_name = $comment->{COMMENT_NAME}; my $ascii_name = $comment->{COMMENT_NAME};
$ascii_name =~ s/W$/A/; $ascii_name =~ s/W$/A/;

View File

@ -398,7 +398,7 @@ couldn't generate code and has placed an '@forward' line in the .spec file):
winedump spec msvcrt -C -o ms_msvcrt winedump spec msvcrt -C -o ms_msvcrt
Install this DLL into the wine tree (since its a stub DLL, no changes are Install this DLL into the wine tree (since it's a stub DLL, no changes are
needed to the code). needed to the code).
Now uncomment the line that winedump inserted into msvcrt.spec: Now uncomment the line that winedump inserted into msvcrt.spec:

View File

@ -868,7 +868,7 @@ static void pdb_ds_dump(void)
* 2: types * 2: types
* 3: modules * 3: modules
* other known streams: * other known streams:
* - string table: it's index is in the stream table from ROOT object under "/names" * - string table: its index is in the stream table from ROOT object under "/names"
* those streams get their indexes out of the PDB_STREAM_INDEXES object * those streams get their indexes out of the PDB_STREAM_INDEXES object
* - FPO data * - FPO data
* - segments * - segments

View File

@ -870,7 +870,7 @@ static void handle_ani_list(riff_tag_t *lst, enum res_e type, int isswapped)
} }
else if(!memcmp(rtp->tag, inam, sizeof(inam))) else if(!memcmp(rtp->tag, inam, sizeof(inam)))
{ {
/* Ignore the icon/cursor name; its a string */ /* Ignore the icon/cursor name; it's a string */
rtp = NEXT_TAG(rtp); rtp = NEXT_TAG(rtp);
} }
else if(!memcmp(rtp->tag, iart, sizeof(iart))) else if(!memcmp(rtp->tag, iart, sizeof(iart)))

View File

@ -1786,8 +1786,8 @@ file_raw: filename { $$ = load_file($1,dup_language(currentlanguage)); }
; ;
/* ------------------------------ Win32 expressions ------------------------------ */ /* ------------------------------ Win32 expressions ------------------------------ */
/* All win16 numbers are also handled here. This is inconsistent with MS' /* All win16 numbers are also handled here. This is inconsistent with MS
* resource compiler, but what the heck, its just handy to have. * resource compiler, but what the heck, it's just handy to have.
*/ */
e_expr : /* Empty */ { $$ = 0; } e_expr : /* Empty */ { $$ = 0; }
| expr { $$ = new_int($1); } | expr { $$ = new_int($1); }

View File

@ -176,7 +176,7 @@ enum res_e {
res_rdt, res_rdt,
res_msg, res_msg,
res_curg, res_curg,
res_13, /* Hm, wonder why its not used... */ res_13, /* Hm, wonder why it's not used... */
res_icog, res_icog,
res_15, res_15,
res_ver, res_ver,