forked from Mirrors/wine-wine
Assorted spelling fixes.
Remove wszRegSeparator from devenum_private.h since it's neither exported by createdevenum.c nor used by anyone else.oldstable
parent
f04b9d0b07
commit
66834324b1
|
@ -543,7 +543,7 @@ unsigned long elf_read_wine_loader_dbg_info(struct process* pcs)
|
||||||
elf_info.flags = ELF_INFO_DEBUG_HEADER;
|
elf_info.flags = ELF_INFO_DEBUG_HEADER;
|
||||||
/* All binaries are loaded with WINELOADER (if run from tree) or by the
|
/* All binaries are loaded with WINELOADER (if run from tree) or by the
|
||||||
* main executable (either wine-kthread or wine-pthread)
|
* main executable (either wine-kthread or wine-pthread)
|
||||||
* Note: the heuristic use to know wether we need to load wine-pthread or
|
* Note: the heuristic use to know whether we need to load wine-pthread or
|
||||||
* wine-kthread is not 100% safe
|
* wine-kthread is not 100% safe
|
||||||
*/
|
*/
|
||||||
if ((ptr = getenv("WINELOADER")))
|
if ((ptr = getenv("WINELOADER")))
|
||||||
|
|
|
@ -356,7 +356,7 @@ BOOL WINAPI StackWalk(DWORD MachineType, HANDLE hProcess, HANDLE hThread,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
frame->AddrFrame.Offset &= ~1;
|
frame->AddrFrame.Offset &= ~1;
|
||||||
/* we "pop" paramaters as 16 bit entities... of course, this won't
|
/* we "pop" parameters as 16 bit entities... of course, this won't
|
||||||
* work if the parameter is in fact bigger than 16bit, but
|
* work if the parameter is in fact bigger than 16bit, but
|
||||||
* there's no way to know that here
|
* there's no way to know that here
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -39,7 +39,7 @@ extern HINSTANCE DEVENUM_hInstance;
|
||||||
|
|
||||||
const WCHAR wszInstanceKeyName[] ={'I','n','s','t','a','n','c','e',0};
|
const WCHAR wszInstanceKeyName[] ={'I','n','s','t','a','n','c','e',0};
|
||||||
|
|
||||||
static const WCHAR wszRegSeperator[] = {'\\', 0 };
|
static const WCHAR wszRegSeparator[] = {'\\', 0 };
|
||||||
static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\',
|
static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\',
|
||||||
'M','i','c','r','o','s','o','f','t','\\',
|
'M','i','c','r','o','s','o','f','t','\\',
|
||||||
'A','c','t','i','v','e','M','o','v','i','e','\\',
|
'A','c','t','i','v','e','M','o','v','i','e','\\',
|
||||||
|
@ -141,12 +141,12 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
|
||||||
{
|
{
|
||||||
hbasekey = HKEY_CLASSES_ROOT;
|
hbasekey = HKEY_CLASSES_ROOT;
|
||||||
strcpyW(wszRegKey, clsid_keyname);
|
strcpyW(wszRegKey, clsid_keyname);
|
||||||
strcatW(wszRegKey, wszRegSeperator);
|
strcatW(wszRegKey, wszRegSeparator);
|
||||||
|
|
||||||
if (!StringFromGUID2(clsidDeviceClass, wszRegKey + CLSID_STR_LEN, MAX_PATH - CLSID_STR_LEN))
|
if (!StringFromGUID2(clsidDeviceClass, wszRegKey + CLSID_STR_LEN, MAX_PATH - CLSID_STR_LEN))
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
strcatW(wszRegKey, wszRegSeperator);
|
strcatW(wszRegKey, wszRegSeparator);
|
||||||
strcatW(wszRegKey, wszInstanceKeyName);
|
strcatW(wszRegKey, wszInstanceKeyName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,6 @@ extern ParseDisplayNameImpl DEVENUM_ParseDisplayName;
|
||||||
*/
|
*/
|
||||||
extern const WCHAR clsid_keyname[6];
|
extern const WCHAR clsid_keyname[6];
|
||||||
extern const WCHAR wszInstanceKeyName[];
|
extern const WCHAR wszInstanceKeyName[];
|
||||||
extern const WCHAR wszRegSeperator[];
|
|
||||||
#define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR))
|
#define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR))
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
|
|
|
@ -855,7 +855,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3: /*
|
case 3: /*
|
||||||
* Return the pszBase scheme with pszRelative. Basicly
|
* Return the pszBase scheme with pszRelative. Basically
|
||||||
* keeps the scheme and replaces the domain and following.
|
* keeps the scheme and replaces the domain and following.
|
||||||
*/
|
*/
|
||||||
len = base.sizep1 + 1 + relative.sizep2 + 1;
|
len = base.sizep1 + 1 + relative.sizep2 + 1;
|
||||||
|
|
|
@ -638,7 +638,7 @@ Options:
|
||||||
on the screen, and the window which displays a
|
on the screen, and the window which displays a
|
||||||
given area of this screen buffer. Note that the
|
given area of this screen buffer. Note that the
|
||||||
window is always smaller or of the same size than
|
window is always smaller or of the same size than
|
||||||
the screen buffer. Having a stricly smaller window
|
the screen buffer. Having a strictly smaller window
|
||||||
size will put on scrollbars on the window so that
|
size will put on scrollbars on the window so that
|
||||||
you can see the whole screenbuffer's content.
|
you can see the whole screenbuffer's content.
|
||||||
</entry>
|
</entry>
|
||||||
|
|
|
@ -347,8 +347,8 @@ DECL_WINELIB_TYPE_AW(PPRINTER_INFO_1)
|
||||||
DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_1)
|
DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_1)
|
||||||
|
|
||||||
/* FIXME: winspool.h declares some structure members with the name Status.
|
/* FIXME: winspool.h declares some structure members with the name Status.
|
||||||
* unfortunatly <X11/ICE/ICElib.h> #defines Status to the type 'int'
|
* unfortunately <X11/ICE/ICElib.h> #defines Status to the type 'int'
|
||||||
* therfore the following hack */
|
* therefore the following hack */
|
||||||
#ifndef Status
|
#ifndef Status
|
||||||
|
|
||||||
typedef struct _PRINTER_INFO_2A {
|
typedef struct _PRINTER_INFO_2A {
|
||||||
|
|
Loading…
Reference in New Issue