Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gbrunmar] 31492: Display device enumeration in d3d9
by gbrunmar＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: gbrunmar Date: Sat Dec 29 18:19:13 2007 New Revision: 31492 URL: http://svn.reactos.org/svn/reactos?rev=31492&view=rev Log: Display device enumeration in d3d9 Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Sat Dec 29 18:19:13 2007 @@ -13,9 +13,11 @@ #define MEM_ALIGNMENT 0x20 -static LPCSTR D3dDebugRegPath = "Software\\Microsoft\\Direct3D"; +static LPCSTR D3D9_DebugRegPath = "Software\\Microsoft\\Direct3D"; static const GUID DISPLAY_GUID = { 0x67685559, 0x3106, 0x11D0, { 0xB9, 0x71, 0x00, 0xAA, 0x00, 0x34, 0x2F, 0x9F } }; + +static CHAR D3D9_PrimaryDeviceName[32]; LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) { @@ -28,7 +30,7 @@ DWORD Type; LONG Ret; - if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, D3dDebugRegPath, 0, KEY_QUERY_VALUE, &hKey)) + if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, D3D9_DebugRegPath, 0, KEY_QUERY_VALUE, &hKey)) return FALSE; Ret = RegQueryValueEx(hKey, ValueName, 0, &Type, DataBuffer, DataBufferSize); @@ -63,6 +65,68 @@ return 0; } +static BOOL GetDisplayDeviceInfo(IN OUT LPDIRECT3D9_INT pDirect3D9) +{ + DISPLAY_DEVICEA DisplayDevice; + DWORD AdapterIndex; + DWORD Planes; + DWORD Bpp; + HDC hDC; + + memset(&DisplayDevice, 0, sizeof(DISPLAY_DEVICEA)); + DisplayDevice.cb = sizeof(DISPLAY_DEVICEA); + + pDirect3D9->dwNumDisplayAdapters = 0; + D3D9_PrimaryDeviceName[0] = '\0'; + + AdapterIndex = 0; + while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) + { + if ((DisplayDevice.StateFlags & (DISPLAY_DEVICE_DISCONNECT | DISPLAY_DEVICE_MIRRORING_DRIVER)) == 0 && + (DisplayDevice.StateFlags & (DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) != 0) + { + memcpy(&pDirect3D9->DisplayAdapters[0].DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); + + lstrcpynA(pDirect3D9->DisplayAdapters[0].szDeviceName, DisplayDevice.DeviceName, MAX_PATH); + + if (pDirect3D9->dwNumDisplayAdapters == 0) + lstrcpynA(D3D9_PrimaryDeviceName, DisplayDevice.DeviceName, sizeof(D3D9_PrimaryDeviceName)); + + pDirect3D9->DisplayAdapters[0].dwStateFlags = DisplayDevice.StateFlags; + pDirect3D9->DisplayAdapters[0].bInUseFlag = TRUE; + + ++pDirect3D9->dwNumDisplayAdapters; + } + } + + AdapterIndex = 0; + while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) + { + if ((DisplayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0 && + (DisplayDevice.StateFlags & (DISPLAY_DEVICE_MIRRORING_DRIVER | DISPLAY_DEVICE_PRIMARY_DEVICE)) == 0) + { + memcpy(&pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); + + lstrcpynA(pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].szDeviceName, DisplayDevice.DeviceName, MAX_PATH); + + pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].dwStateFlags = DisplayDevice.StateFlags; + pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].bInUseFlag = TRUE; + + ++pDirect3D9->dwNumDisplayAdapters; + } + } + + hDC = GetDC(NULL); + Planes = GetDeviceCaps(hDC, PLANES); + Bpp = GetDeviceCaps(hDC, BITSPIXEL); + ReleaseDC(NULL, hDC); + + if (Planes * Bpp < 8) + return FALSE; + + return TRUE; +} + HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9) { LPDIRECT3D9_INT pDirect3D9; @@ -80,7 +144,7 @@ pDirect3D9->lpInt = 0; pDirect3D9->lpVtbl = &Direct3D9_Vtbl; - pDirect3D9->dwProcessId = GetCurrentThreadId(); + //pDirect3D9->dwProcessId = GetCurrentThreadId(); pDirect3D9->dwRefCnt = 1; pDirect3D9->unknown004576 = 0; @@ -95,9 +159,10 @@ pDirect3D9->lpInt = pDirect3D9; pDirect3D9->unknown000007 = 1; - InitializeCriticalSection(&pDirect3D9->d3d9_cs); - - memcpy(&pDirect3D9->DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); + //InitializeCriticalSection(&pDirect3D9->d3d9_cs); + + //memset(pDirect3D9->DisplayAdapters, 0, sizeof(pDirect3D9->DisplayAdapters)); + GetDisplayDeviceInfo(pDirect3D9); *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sat Dec 29 18:19:13 2007 @@ -19,6 +19,118 @@ extern const IDirect3D9Vtbl Direct3D9_Vtbl; +typedef struct _tagDIRECT3D9DisplayAdapterInfo_ +{ +/* 0x0000 */ GUID DisplayGuid; +/* 0x0010 */ CHAR szDeviceName[MAX_PATH]; +/* 0x0114 */ DWORD dwStateFlags; +/* 0x0118 */ BOOL bInUseFlag; +/* 0x011c */ DWORD unknown000002; +/* 0x0120 */ DWORD unknown000003; +/* 0x0124 */ DWORD unknown000004; /* 0x00000001 */ +/* 0x0128 */ DWORD unknown000005; +/* 0x012c */ DWORD unknown000006; +/* 0x0130 */ DWORD unknown000007; +/* 0x0134 */ DWORD unknown000008; +/* 0x0138 */ DWORD unknown000009; +/* 0x013c */ DWORD unknown000010; +/* 0x0140 */ DWORD unknown000011; +/* 0x0144 */ DWORD unknown000012; +/* 0x0148 */ DWORD unknown000013; +/* 0x014c */ DWORD unknown000014; +/* 0x0150 */ DWORD unknown000015; +/* 0x0154 */ DWORD unknown000016; +/* 0x0158 */ DWORD unknown000017; +/* 0x015c */ DWORD unknown000018; +/* 0x0160 */ DWORD unknown000019; +/* 0x0164 */ DWORD unknown000020; +/* 0x0168 */ DWORD unknown000021; +/* 0x016c */ DWORD unknown000022; +/* 0x0170 */ DWORD unknown000023; +/* 0x0174 */ DWORD unknown000024; +/* 0x0178 */ DWORD unknown000025; +/* 0x017c */ DWORD unknown000026; +/* 0x0180 */ DWORD unknown000027; +/* 0x0184 */ DWORD unknown000028; +/* 0x0188 */ DWORD unknown000029; +/* 0x018c */ DWORD unknown000030; +/* 0x0190 */ DWORD unknown000031; +/* 0x0194 */ DWORD unknown000032; +/* 0x0198 */ DWORD unknown000033; +/* 0x019c */ DWORD unknown000034; +/* 0x01a0 */ DWORD unknown000035; +/* 0x01a4 */ DWORD unknown000036; +/* 0x01a8 */ DWORD unknown000037; +/* 0x01ac */ DWORD unknown000038; +/* 0x01b0 */ DWORD unknown000039; +/* 0x01b4 */ DWORD unknown000040; +/* 0x01b8 */ DWORD unknown000041; +/* 0x01bc */ DWORD unknown000042; +/* 0x01c0 */ DWORD unknown000043; +/* 0x01c4 */ DWORD unknown000044; +/* 0x01c8 */ DWORD unknown000045; +/* 0x01cc */ DWORD unknown000046; +/* 0x01d0 */ DWORD unknown000047; +/* 0x01d4 */ DWORD unknown000048; +/* 0x01d8 */ DWORD unknown000049; +/* 0x01dc */ DWORD unknown000050; +/* 0x01e0 */ DWORD unknown000051; +/* 0x01e4 */ DWORD unknown000052; +/* 0x01e8 */ DWORD unknown000053; +/* 0x01ec */ DWORD unknown000054; +/* 0x01f0 */ DWORD unknown000055; +/* 0x01f4 */ DWORD unknown000056; +/* 0x01f8 */ DWORD unknown000057; +/* 0x01fc */ DWORD unknown000058; +/* 0x0200 */ DWORD unknown000059; +/* 0x0204 */ DWORD unknown000060; +/* 0x0208 */ DWORD unknown000061; +/* 0x020c */ DWORD unknown000062; +/* 0x0210 */ DWORD unknown000063; +/* 0x0214 */ DWORD unknown000064; +/* 0x0218 */ DWORD unknown000065; +/* 0x021c */ DWORD unknown000066; +/* 0x0220 */ DWORD unknown000067; +/* 0x0224 */ DWORD unknown000068; +/* 0x0228 */ DWORD unknown000069; +/* 0x022c */ DWORD unknown000070; +/* 0x0230 */ DWORD unknown000071; +/* 0x0234 */ DWORD unknown000072; +/* 0x0238 */ DWORD unknown000073; +/* 0x023c */ DWORD unknown000074; +/* 0x0240 */ DWORD unknown000075; +/* 0x0244 */ DWORD unknown000076; +/* 0x0248 */ DWORD unknown000077; +/* 0x024c */ DWORD unknown000078; +/* 0x0250 */ DWORD unknown000079; +/* 0x0254 */ DWORD unknown000080; +/* 0x0258 */ DWORD unknown000081; +/* 0x025c */ DWORD unknown000082; +/* 0x0260 */ DWORD unknown000083; +/* 0x0264 */ DWORD unknown000084; +/* 0x0268 */ DWORD unknown000085; +/* 0x026c */ DWORD dwDisplayWidth; /* Current display res */ +/* 0x0270 */ DWORD dwDisplayHeight; /* Current display res */ +/* 0x0274 */ DWORD unknown000088; +/* 0x0278 */ DWORD unknown000089; +/* 0x027c */ DWORD unknown000090; +/* 0x0280 */ DWORD unknown000091; +/* 0x0284 */ DWORD unknown000092; +/* 0x0288 */ DWORD unknown000093; +/* 0x028c */ DWORD unknown000094; +/* 0x0290 */ DWORD unknown000095; +/* 0x0294 */ DWORD unknown000096; +/* 0x0298 */ DWORD unknown000097; +/* 0x029c */ DWORD unknown000098; +/* 0x02a0 */ DWORD unknown000099; +/* 0x02a4 */ DWORD unknown000100; +/* 0x02a8 */ DWORD unknown000101; /*? 0xf7627000 */ +/* 0x02ac */ DWORD unknown000102; /*? 0x00000002 */ +/* 0x02b0 */ DWORD unknown000103; /*? 0x001552A0 */ +/* 0x02b4 */ DWORD unknown000104; +/* 0x02b8 */ DWORD unknown000105; +} Direct3D9DisplayAdapterInfo_INT; + typedef struct _tagDIRECT3D9_INT_ { /* 0x0000 */ const IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions table */ @@ -27,465 +139,8 @@ /* 0x0020 */ DWORD dwProcessId; /* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ -/* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably NumDisplays */ -/* 0x0030 */ GUID DisplayGuid; /*? Always {67685559-3106-11D0-B971-00AA00342F9F} ? */ -/* 0x0040 */ CHAR DeviceName[MAX_PATH]; -/* 0x0144 */ DWORD StateFlags; /*? 0x80000001 */ -/* 0x0148 */ DWORD unknown000082; /*? 0x00000001 */ -/* 0x014c */ DWORD unknown000083; -/* 0x0150 */ DWORD unknown000084; -/* 0x0154 */ DWORD unknown000085; /* 0x00000001 */ -/* 0x0158 */ DWORD unknown000086; -/* 0x015c */ DWORD unknown000087; -/* 0x0160 */ DWORD unknown000088; -/* 0x0164 */ DWORD unknown000089; -/* 0x0168 */ DWORD unknown000090; -/* 0x016c */ DWORD unknown000091; -/* 0x0170 */ DWORD unknown000092; -/* 0x0174 */ DWORD unknown000093; -/* 0x0178 */ DWORD unknown000094; -/* 0x017c */ DWORD unknown000095; -/* 0x0180 */ DWORD unknown000096; -/* 0x0184 */ DWORD unknown000097; -/* 0x0188 */ DWORD unknown000098; -/* 0x018c */ DWORD unknown000099; -/* 0x0190 */ DWORD unknown000100; -/* 0x0194 */ DWORD unknown000101; -/* 0x0198 */ DWORD unknown000102; -/* 0x019c */ DWORD unknown000103; -/* 0x01a0 */ DWORD unknown000104; -/* 0x01a4 */ DWORD unknown000105; -/* 0x01a8 */ DWORD unknown000106; -/* 0x01ac */ DWORD unknown000107; -/* 0x01b0 */ DWORD unknown000108; -/* 0x01b4 */ DWORD unknown000109; -/* 0x01b8 */ DWORD unknown000110; -/* 0x01bc */ DWORD unknown000111; -/* 0x01c0 */ DWORD unknown000112; -/* 0x01c4 */ DWORD unknown000113; -/* 0x01c8 */ DWORD unknown000114; -/* 0x01cc */ DWORD unknown000115; -/* 0x01d0 */ DWORD unknown000116; -/* 0x01d4 */ DWORD unknown000117; -/* 0x01d8 */ DWORD unknown000118; -/* 0x01dc */ DWORD unknown000119; -/* 0x01e0 */ DWORD unknown000120; -/* 0x01e4 */ DWORD unknown000121; -/* 0x01e8 */ DWORD unknown000122; -/* 0x01ec */ DWORD unknown000123; -/* 0x01f0 */ DWORD unknown000124; -/* 0x01f4 */ DWORD unknown000125; -/* 0x01f8 */ DWORD unknown000126; -/* 0x01fc */ DWORD unknown000127; -/* 0x0200 */ DWORD unknown000128; -/* 0x0204 */ DWORD unknown000129; -/* 0x0208 */ DWORD unknown000130; -/* 0x020c */ DWORD unknown000131; -/* 0x0210 */ DWORD unknown000132; -/* 0x0214 */ DWORD unknown000133; -/* 0x0218 */ DWORD unknown000134; -/* 0x021c */ DWORD unknown000135; -/* 0x0220 */ DWORD unknown000136; -/* 0x0224 */ DWORD unknown000137; -/* 0x0228 */ DWORD unknown000138; -/* 0x022c */ DWORD unknown000139; -/* 0x0230 */ DWORD unknown000140; -/* 0x0234 */ DWORD unknown000141; -/* 0x0238 */ DWORD unknown000142; -/* 0x023c */ DWORD unknown000143; -/* 0x0240 */ DWORD unknown000144; -/* 0x0244 */ DWORD unknown000145; -/* 0x0248 */ DWORD unknown000146; -/* 0x024c */ DWORD unknown000147; -/* 0x0250 */ DWORD unknown000148; -/* 0x0254 */ DWORD unknown000149; -/* 0x0258 */ DWORD unknown000150; -/* 0x025c */ DWORD unknown000151; -/* 0x0260 */ DWORD unknown000152; -/* 0x0264 */ DWORD unknown000153; -/* 0x0268 */ DWORD unknown000154; -/* 0x026c */ DWORD unknown000155; -/* 0x0270 */ DWORD unknown000156; -/* 0x0274 */ DWORD unknown000157; -/* 0x0278 */ DWORD unknown000158; -/* 0x027c */ DWORD unknown000159; -/* 0x0280 */ DWORD unknown000160; -/* 0x0284 */ DWORD unknown000161; -/* 0x0288 */ DWORD unknown000162; -/* 0x028c */ DWORD unknown000163; -/* 0x0290 */ DWORD unknown000164; -/* 0x0294 */ DWORD unknown000165; -/* 0x0298 */ DWORD unknown000166; -/* 0x029c */ DWORD dwDisplayWidth; /* Current display res */ -/* 0x02a0 */ DWORD dwDisplayHeight; /* Current display res */ -/* 0x02a4 */ DWORD unknown000169; -/* 0x02a8 */ DWORD unknown000170; -/* 0x02ac */ DWORD unknown000171; -/* 0x02b0 */ DWORD unknown000172; -/* 0x02b4 */ DWORD unknown000173; -/* 0x02b8 */ DWORD unknown000174; -/* 0x02bc */ DWORD unknown000175; -/* 0x02c0 */ DWORD unknown000176; -/* 0x02c4 */ DWORD unknown000177; -/* 0x02c8 */ DWORD unknown000178; -/* 0x02cc */ DWORD unknown000179; -/* 0x02d0 */ DWORD unknown000180; -/* 0x02d4 */ DWORD unknown000181; -/* 0x02d8 */ DWORD unknown000182; /*? 0xf7627000 */ -/* 0x02dc */ DWORD unknown000183; /*? 0x00000002 */ -/* 0x02e0 */ DWORD unknown000184; /*? 0x001552A0 */ -/* 0x02e4 */ DWORD unknown000185; -/* 0x02e8 */ DWORD unknown000186; -/* 0x02ec */ DWORD unknown000187; -/* 0x02f0 */ DWORD unknown000188; -/* 0x02f4 */ DWORD unknown000189; -/* 0x02f8 */ DWORD unknown000190; -/* 0x02fc */ DWORD unknown000191; -/* 0x0300 */ DWORD unknown000192; -/* 0x0304 */ DWORD unknown000193; -/* 0x0308 */ DWORD unknown000194; -/* 0x030c */ DWORD unknown000195; -/* 0x0310 */ DWORD unknown000196; -/* 0x0314 */ DWORD unknown000197; -/* 0x0318 */ DWORD unknown000198; -/* 0x031c */ DWORD unknown000199; -/* 0x0320 */ DWORD unknown000200; -/* 0x0324 */ DWORD unknown000201; -/* 0x0328 */ DWORD unknown000202; -/* 0x032c */ DWORD unknown000203; -/* 0x0330 */ DWORD unknown000204; -/* 0x0334 */ DWORD unknown000205; -/* 0x0338 */ DWORD unknown000206; -/* 0x033c */ DWORD unknown000207; -/* 0x0340 */ DWORD unknown000208; -/* 0x0344 */ DWORD unknown000209; -/* 0x0348 */ DWORD unknown000210; -/* 0x034c */ DWORD unknown000211; -/* 0x0350 */ DWORD unknown000212; -/* 0x0354 */ DWORD unknown000213; -/* 0x0358 */ DWORD unknown000214; -/* 0x035c */ DWORD unknown000215; -/* 0x0360 */ DWORD unknown000216; -/* 0x0364 */ DWORD unknown000217; -/* 0x0368 */ DWORD unknown000218; -/* 0x036c */ DWORD unknown000219; -/* 0x0370 */ DWORD unknown000220; -/* 0x0374 */ DWORD unknown000221; -/* 0x0378 */ DWORD unknown000222; -/* 0x037c */ DWORD unknown000223; -/* 0x0380 */ DWORD unknown000224; -/* 0x0384 */ DWORD unknown000225; -/* 0x0388 */ DWORD unknown000226; -/* 0x038c */ DWORD unknown000227; -/* 0x0390 */ DWORD unknown000228; -/* 0x0394 */ DWORD unknown000229; -/* 0x0398 */ DWORD unknown000230; -/* 0x039c */ DWORD unknown000231; -/* 0x03a0 */ DWORD unknown000232; -/* 0x03a4 */ DWORD unknown000233; -/* 0x03a8 */ DWORD unknown000234; -/* 0x03ac */ DWORD unknown000235; -/* 0x03b0 */ DWORD unknown000236; -/* 0x03b4 */ DWORD unknown000237; -/* 0x03b8 */ DWORD unknown000238; -/* 0x03bc */ DWORD unknown000239; -/* 0x03c0 */ DWORD unknown000240; -/* 0x03c4 */ DWORD unknown000241; -/* 0x03c8 */ DWORD unknown000242; -/* 0x03cc */ DWORD unknown000243; -/* 0x03d0 */ DWORD unknown000244; -/* 0x03d4 */ DWORD unknown000245; -/* 0x03d8 */ DWORD unknown000246; -/* 0x03dc */ DWORD unknown000247; -/* 0x03e0 */ DWORD unknown000248; -/* 0x03e4 */ DWORD unknown000249; -/* 0x03e8 */ DWORD unknown000250; -/* 0x03ec */ DWORD unknown000251; -/* 0x03f0 */ DWORD unknown000252; -/* 0x03f4 */ DWORD unknown000253; -/* 0x03f8 */ DWORD unknown000254; -/* 0x03fc */ DWORD unknown000255; -/* 0x0400 */ DWORD unknown000256; -/* 0x0404 */ DWORD unknown000257; -/* 0x0408 */ DWORD unknown000258; -/* 0x040c */ DWORD unknown000259; -/* 0x0410 */ DWORD unknown000260; -/* 0x0414 */ DWORD unknown000261; -/* 0x0418 */ DWORD unknown000262; -/* 0x041c */ DWORD unknown000263; -/* 0x0420 */ DWORD unknown000264; -/* 0x0424 */ DWORD unknown000265; -/* 0x0428 */ DWORD unknown000266; -/* 0x042c */ DWORD unknown000267; -/* 0x0430 */ DWORD unknown000268; -/* 0x0434 */ DWORD unknown000269; -/* 0x0438 */ DWORD unknown000270; -/* 0x043c */ DWORD unknown000271; -/* 0x0440 */ DWORD unknown000272; -/* 0x0444 */ DWORD unknown000273; -/* 0x0448 */ DWORD unknown000274; -/* 0x044c */ DWORD unknown000275; -/* 0x0450 */ DWORD unknown000276; -/* 0x0454 */ DWORD unknown000277; -/* 0x0458 */ DWORD unknown000278; -/* 0x045c */ DWORD unknown000279; -/* 0x0460 */ DWORD unknown000280; -/* 0x0464 */ DWORD unknown000281; -/* 0x0468 */ DWORD unknown000282; -/* 0x046c */ DWORD unknown000283; -/* 0x0470 */ DWORD unknown000284; -/* 0x0474 */ DWORD unknown000285; -/* 0x0478 */ DWORD unknown000286; -/* 0x047c */ DWORD unknown000287; -/* 0x0480 */ DWORD unknown000288; -/* 0x0484 */ DWORD unknown000289; -/* 0x0488 */ DWORD unknown000290; -/* 0x048c */ DWORD unknown000291; -/* 0x0490 */ DWORD unknown000292; -/* 0x0494 */ DWORD unknown000293; -/* 0x0498 */ DWORD unknown000294; -/* 0x049c */ DWORD unknown000295; -/* 0x04a0 */ DWORD unknown000296; -/* 0x04a4 */ DWORD unknown000297; -/* 0x04a8 */ DWORD unknown000298; -/* 0x04ac */ DWORD unknown000299; -/* 0x04b0 */ DWORD unknown000300; -/* 0x04b4 */ DWORD unknown000301; -/* 0x04b8 */ DWORD unknown000302; -/* 0x04bc */ DWORD unknown000303; -/* 0x04c0 */ DWORD unknown000304; -/* 0x04c4 */ DWORD unknown000305; -/* 0x04c8 */ DWORD unknown000306; -/* 0x04cc */ DWORD unknown000307; -/* 0x04d0 */ DWORD unknown000308; -/* 0x04d4 */ DWORD unknown000309; -/* 0x04d8 */ DWORD unknown000310; -/* 0x04dc */ DWORD unknown000311; -/* 0x04e0 */ DWORD unknown000312; -/* 0x04e4 */ DWORD unknown000313; -/* 0x04e8 */ DWORD unknown000314; -/* 0x04ec */ DWORD unknown000315; -/* 0x04f0 */ DWORD unknown000316; -/* 0x04f4 */ DWORD unknown000317; -/* 0x04f8 */ DWORD unknown000318; -/* 0x04fc */ DWORD unknown000319; -/* 0x0500 */ DWORD unknown000320; -/* 0x0504 */ DWORD unknown000321; -/* 0x0508 */ DWORD unknown000322; -/* 0x050c */ DWORD unknown000323; -/* 0x0510 */ DWORD unknown000324; -/* 0x0514 */ DWORD unknown000325; -/* 0x0518 */ DWORD unknown000326; -/* 0x051c */ DWORD unknown000327; -/* 0x0520 */ DWORD unknown000328; -/* 0x0524 */ DWORD unknown000329; -/* 0x0528 */ DWORD unknown000330; -/* 0x052c */ DWORD unknown000331; -/* 0x0530 */ DWORD unknown000332; -/* 0x0534 */ DWORD unknown000333; -/* 0x0538 */ DWORD unknown000334; -/* 0x053c */ DWORD unknown000335; -/* 0x0540 */ DWORD unknown000336; -/* 0x0544 */ DWORD unknown000337; -/* 0x0548 */ DWORD unknown000338; -/* 0x054c */ DWORD unknown000339; -/* 0x0550 */ DWORD unknown000340; -/* 0x0554 */ DWORD unknown000341; -/* 0x0558 */ DWORD unknown000342; -/* 0x055c */ DWORD unknown000343; -/* 0x0560 */ DWORD unknown000344; -/* 0x0564 */ DWORD unknown000345; -/* 0x0568 */ DWORD unknown000346; -/* 0x056c */ DWORD unknown000347; -/* 0x0570 */ DWORD unknown000348; -/* 0x0574 */ DWORD unknown000349; -/* 0x0578 */ DWORD unknown000350; -/* 0x057c */ DWORD unknown000351; -/* 0x0580 */ DWORD unknown000352; -/* 0x0584 */ DWORD unknown000353; -/* 0x0588 */ DWORD unknown000354; -/* 0x058c */ DWORD unknown000355; -/* 0x0590 */ DWORD unknown000356; -/* 0x0594 */ DWORD unknown000357; -/* 0x0598 */ DWORD unknown000358; -/* 0x059c */ DWORD unknown000359; -/* 0x05a0 */ DWORD unknown000360; -/* 0x05a4 */ DWORD unknown000361; -/* 0x05a8 */ DWORD unknown000362; -/* 0x05ac */ DWORD unknown000363; -/* 0x05b0 */ DWORD unknown000364; -/* 0x05b4 */ DWORD unknown000365; -/* 0x05b8 */ DWORD unknown000366; -/* 0x05bc */ DWORD unknown000367; -/* 0x05c0 */ DWORD unknown000368; -/* 0x05c4 */ DWORD unknown000369; -/* 0x05c8 */ DWORD unknown000370; -/* 0x05cc */ DWORD unknown000371; -/* 0x05d0 */ DWORD unknown000372; -/* 0x05d4 */ DWORD unknown000373; -/* 0x05d8 */ DWORD unknown000374; -/* 0x05dc */ DWORD unknown000375; -/* 0x05e0 */ DWORD unknown000376; -/* 0x05e4 */ DWORD unknown000377; -/* 0x05e8 */ DWORD unknown000378; -/* 0x05ec */ DWORD unknown000379; -/* 0x05f0 */ DWORD unknown000380; -/* 0x05f4 */ DWORD unknown000381; -/* 0x05f8 */ DWORD unknown000382; -/* 0x05fc */ DWORD unknown000383; -/* 0x0600 */ DWORD unknown000384; -/* 0x0604 */ DWORD unknown000385; -/* 0x0608 */ DWORD unknown000386; -/* 0x060c */ DWORD unknown000387; -/* 0x0610 */ DWORD unknown000388; -/* 0x0614 */ DWORD unknown000389; -/* 0x0618 */ DWORD unknown000390; -/* 0x061c */ DWORD unknown000391; -/* 0x0620 */ DWORD unknown000392; -/* 0x0624 */ DWORD unknown000393; -/* 0x0628 */ DWORD unknown000394; -/* 0x062c */ DWORD unknown000395; -/* 0x0630 */ DWORD unknown000396; -/* 0x0634 */ DWORD unknown000397; -/* 0x0638 */ DWORD unknown000398; -/* 0x063c */ DWORD unknown000399; -/* 0x0640 */ DWORD unknown000400; -/* 0x0644 */ DWORD unknown000401; -/* 0x0648 */ DWORD unknown000402; -/* 0x064c */ DWORD unknown000403; -/* 0x0650 */ DWORD unknown000404; -/* 0x0654 */ DWORD unknown000405; -/* 0x0658 */ DWORD unknown000406; -/* 0x065c */ DWORD unknown000407; -/* 0x0660 */ DWORD unknown000408; -/* 0x0664 */ DWORD unknown000409; -/* 0x0668 */ DWORD unknown000410; -/* 0x066c */ DWORD unknown000411; -/* 0x0670 */ DWORD unknown000412; -/* 0x0674 */ DWORD unknown000413; -/* 0x0678 */ DWORD unknown000414; -/* 0x067c */ DWORD unknown000415; -/* 0x0680 */ DWORD unknown000416; -/* 0x0684 */ DWORD unknown000417; -/* 0x0688 */ DWORD unknown000418; -/* 0x068c */ DWORD unknown000419; -/* 0x0690 */ DWORD unknown000420; -/* 0x0694 */ DWORD unknown000421; -/* 0x0698 */ DWORD unknown000422; -/* 0x069c */ DWORD unknown000423; -/* 0x06a0 */ DWORD unknown000424; -/* 0x06a4 */ DWORD unknown000425; -/* 0x06a8 */ DWORD unknown000426; -/* 0x06ac */ DWORD unknown000427; -/* 0x06b0 */ DWORD unknown000428; -/* 0x06b4 */ DWORD unknown000429; -/* 0x06b8 */ DWORD unknown000430; -/* 0x06bc */ DWORD unknown000431; -/* 0x06c0 */ DWORD unknown000432; -/* 0x06c4 */ DWORD unknown000433; -/* 0x06c8 */ DWORD unknown000434; -/* 0x06cc */ DWORD unknown000435; -/* 0x06d0 */ DWORD unknown000436; -/* 0x06d4 */ DWORD unknown000437; -/* 0x06d8 */ DWORD unknown000438; -/* 0x06dc */ DWORD unknown000439; -/* 0x06e0 */ DWORD unknown000440; -/* 0x06e4 */ DWORD unknown000441; -/* 0x06e8 */ DWORD unknown000442; -/* 0x06ec */ DWORD unknown000443; -/* 0x06f0 */ DWORD unknown000444; -/* 0x06f4 */ DWORD unknown000445; -/* 0x06f8 */ DWORD unknown000446; -/* 0x06fc */ DWORD unknown000447; -/* 0x0700 */ DWORD unknown000448; -/* 0x0704 */ DWORD unknown000449; -/* 0x0708 */ DWORD unknown000450; -/* 0x070c */ DWORD unknown000451; -/* 0x0710 */ DWORD unknown000452; -/* 0x0714 */ DWORD unknown000453; -/* 0x0718 */ DWORD unknown000454; -/* 0x071c */ DWORD unknown000455; -/* 0x0720 */ DWORD unknown000456; -/* 0x0724 */ DWORD unknown000457; -/* 0x0728 */ DWORD unknown000458; -/* 0x072c */ DWORD unknown000459; -/* 0x0730 */ DWORD unknown000460; -/* 0x0734 */ DWORD unknown000461; -/* 0x0738 */ DWORD unknown000462; -/* 0x073c */ DWORD unknown000463; -/* 0x0740 */ DWORD unknown000464; -/* 0x0744 */ DWORD unknown000465; -/* 0x0748 */ DWORD unknown000466; -/* 0x074c */ DWORD unknown000467; -/* 0x0750 */ DWORD unknown000468; -/* 0x0754 */ DWORD unknown000469; -/* 0x0758 */ DWORD unknown000470; -/* 0x075c */ DWORD unknown000471; -/* 0x0760 */ DWORD unknown000472; -/* 0x0764 */ DWORD unknown000473; -/* 0x0768 */ DWORD unknown000474; -/* 0x076c */ DWORD unknown000475; -/* 0x0770 */ DWORD unknown000476; -/* 0x0774 */ DWORD unknown000477; -/* 0x0778 */ DWORD unknown000478; -/* 0x077c */ DWORD unknown000479; -/* 0x0780 */ DWORD unknown000480; -/* 0x0784 */ DWORD unknown000481; -/* 0x0788 */ DWORD unknown000482; -/* 0x078c */ DWORD unknown000483; -/* 0x0790 */ DWORD unknown000484; -/* 0x0794 */ DWORD unknown000485; -/* 0x0798 */ DWORD unknown000486; -/* 0x079c */ DWORD unknown000487; -/* 0x07a0 */ DWORD unknown000488; -/* 0x07a4 */ DWORD unknown000489; -/* 0x07a8 */ DWORD unknown000490; -/* 0x07ac */ DWORD unknown000491; -/* 0x07b0 */ DWORD unknown000492; -/* 0x07b4 */ DWORD unknown000493; -/* 0x07b8 */ DWORD unknown000494; -/* 0x07bc */ DWORD unknown000495; -/* 0x07c0 */ DWORD unknown000496; -/* 0x07c4 */ DWORD unknown000497; -/* 0x07c8 */ DWORD unknown000498; -/* 0x07cc */ DWORD unknown000499; -/* 0x07d0 */ DWORD unknown000500; -/* 0x07d4 */ DWORD unknown000501; -/* 0x07d8 */ DWORD unknown000502; -/* 0x07dc */ DWORD unknown000503; -/* 0x07e0 */ DWORD unknown000504; -/* 0x07e4 */ DWORD unknown000505; -/* 0x07e8 */ DWORD unknown000506; -/* 0x07ec */ DWORD unknown000507; -/* 0x07f0 */ DWORD unknown000508; -/* 0x07f4 */ DWORD unknown000509; -/* 0x07f8 */ DWORD unknown000510; -/* 0x07fc */ DWORD unknown000511; -/* 0x0800 */ DWORD unknown000512; -/* 0x0804 */ DWORD unknown000513; -/* 0x0808 */ DWORD unknown000514; -/* 0x080c */ DWORD unknown000515; -/* 0x0810 */ DWORD unknown000516; -/* 0x0814 */ DWORD unknown000517; -/* 0x0818 */ DWORD unknown000518; -/* 0x081c */ DWORD unknown000519; -/* 0x0820 */ DWORD unknown000520; -/* 0x0824 */ DWORD unknown000521; -/* 0x0828 */ DWORD unknown000522; -/* 0x082c */ DWORD unknown000523; -/* 0x0830 */ DWORD unknown000524; -/* 0x0834 */ DWORD unknown000525; -/* 0x0838 */ DWORD unknown000526; -/* 0x083c */ DWORD unknown000527; -/* 0x0840 */ DWORD unknown000528; -/* 0x0844 */ DWORD unknown000529; -/* 0x0848 */ DWORD unknown000530; -/* 0x084c */ DWORD unknown000531; -/* 0x0850 */ DWORD unknown000532; -/* 0x0854 */ DWORD unknown000533; -/* 0x0858 */ DWORD unknown000534; -/* 0x085c */ DWORD unknown000535; -/* 0x0860 */ DWORD unknown000536; +/* 0x002c */ DWORD dwNumDisplayAdapters; +/* 0x0030 */ Direct3D9DisplayAdapterInfo_INT DisplayAdapters[3]; /* 0x0864 */ DWORD unknown000537; /* 0x0868 */ DWORD unknown000538; /* 0x086c */ DWORD unknown000539;

1 0

[dchapyshev] 31491: Add strsafe library (Part 2/2)
by dchapyshev＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: dchapyshev Date: Sat Dec 29 18:16:35 2007 New Revision: 31491 URL: http://svn.reactos.org/svn/reactos?rev=31491&view=rev Log: Add strsafe library (Part 2/2) Added: trunk/reactos/lib/sdk/strsafe/ trunk/reactos/lib/sdk/strsafe/strsafe.c (with props) trunk/reactos/lib/sdk/strsafe/strsafe.rbuild (with props) Modified: trunk/reactos/lib/sdk/sdk.rbuild Modified: trunk/reactos/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=314… ============================================================================== --- trunk/reactos/lib/sdk/sdk.rbuild (original) +++ trunk/reactos/lib/sdk/sdk.rbuild Sat Dec 29 18:16:35 2007 @@ -23,4 +23,7 @@ <directory name="scrnsave"> <xi:include href="scrnsave/scrnsave.rbuild" /> </directory> + <directory name="strsafe"> + <xi:include href="strsafe/strsafe.rbuild" /> + </directory> </group> Added: trunk/reactos/lib/sdk/strsafe/strsafe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/strsafe/strsafe.c?… ============================================================================== --- trunk/reactos/lib/sdk/strsafe/strsafe.c (added) +++ trunk/reactos/lib/sdk/strsafe/strsafe.c Sat Dec 29 18:16:35 2007 @@ -1,0 +1,2834 @@ +/* + * STRSAFE.LIB + * + * Copyright 2007 Dmitry Chapyshev <dmitry(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include <stdio.h> +#include <windows.h> +#include <strsafe.h> + +HRESULT +StringCopyWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc); +HRESULT +StringCopyWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc); +HRESULT +StringCopyExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags); +HRESULT +StringCopyExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags); +HRESULT +StringCopyNWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchSrc); +HRESULT +StringCopyNWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchSrc); +HRESULT +StringCopyNExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cchSrc, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags); +HRESULT +StringCopyNExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cchSrc, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags); +HRESULT +StringCatWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc); +HRESULT +StringCatWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc); +HRESULT +StringCatExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags); +HRESULT +StringCatExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags); +HRESULT +StringCatNWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchMaxAppend); +HRESULT +StringCatNWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchMaxAppend); +HRESULT +StringCatNExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cchMaxAppend, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags); +HRESULT +StringCatNExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cchMaxAppend, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags); +HRESULT +StringVPrintfWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszFormat, + va_list argList); +HRESULT +StringVPrintfWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszFormat, + va_list argList); +HRESULT +StringVPrintfExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags, + LPCTSTR pszFormat, + va_list argList); +HRESULT +StringVPrintfExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + unsigned long dwFlags, + LPCWSTR pszFormat, + va_list argList); +HRESULT +StringLengthWorkerA(LPCTSTR psz, + size_t cchMax, + size_t *pcch); +HRESULT +StringLengthWorkerW(LPCWSTR psz, + size_t cchMax, + size_t *pcch); + +/**************************************************************************/ +// Worker's functions +/**************************************************************************/ +HRESULT +StringCopyWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc) +{ + HRESULT hr = S_OK; + + if (cchDest == 0) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + while (cchDest && (*pszSrc != '\0')) + { + *pszDest++ = *pszSrc++; + cchDest--; + } + if (cchDest == 0) + { + pszDest--; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + *pszDest= '\0'; + } + return hr; +} + +HRESULT +StringCopyWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc) +{ + HRESULT hr = S_OK; + + if (cchDest == 0) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + while (cchDest && (*pszSrc != L'\0')) + { + *pszDest++ = *pszSrc++; + cchDest--; + } + if (cchDest == 0) + { + pszDest--; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + *pszDest= L'\0'; + } + return hr; +} + +HRESULT +StringCopyExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPTSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest != 0) || (cbDest != 0)) + hr = STRSAFE_E_INVALID_PARAMETER; + } + if (pszSrc == NULL) pszSrc = ""; + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + pszDestEnd = pszDest; + cchRemaining = 0; + if (*pszSrc != '\0') + { + if (pszDest == NULL) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + + while (cchRemaining && (*pszSrc != '\0')) + { + *pszDestEnd++= *pszSrc++; + cchRemaining--; + } + + if (cchRemaining > 0) + { + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char))); + } + else + { + pszDestEnd--; + cchRemaining++; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + *pszDestEnd = '\0'; + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringCopyExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest != 0) || (cbDest != 0)) + hr = STRSAFE_E_INVALID_PARAMETER; + } + + if (pszSrc == NULL) pszSrc = L""; + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + pszDestEnd = pszDest; + cchRemaining = 0; + if (*pszSrc != L'\0') + { + if (pszDest == NULL) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + while (cchRemaining && (*pszSrc != L'\0')) + { + *pszDestEnd++= *pszSrc++; + cchRemaining--; + } + if (cchRemaining > 0) + { + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); + } + else + { + pszDestEnd--; + cchRemaining++; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + *pszDestEnd = L'\0'; + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringCopyNWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchSrc) +{ + HRESULT hr = S_OK; + + if (cchDest == 0) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + while (cchDest && cchSrc && (*pszSrc != '\0')) + { + *pszDest++= *pszSrc++; + cchDest--; + cchSrc--; + } + if (cchDest == 0) + { + pszDest--; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + *pszDest= '\0'; + } + return hr; +} + +HRESULT +StringCopyNWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchSrc) +{ + HRESULT hr = S_OK; + + if (cchDest == 0) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + while (cchDest && cchSrc && (*pszSrc != L'\0')) + { + *pszDest++= *pszSrc++; + cchDest--; + cchSrc--; + } + if (cchDest == 0) + { + pszDest--; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + *pszDest= L'\0'; + } + return hr; +} + +HRESULT +StringCopyNExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cchSrc, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPTSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest != 0) || (cbDest != 0)) hr = STRSAFE_E_INVALID_PARAMETER; + } + + if (pszSrc == NULL) pszSrc = ""; + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + pszDestEnd = pszDest; + cchRemaining = 0; + if (*pszSrc != '\0') + { + if (pszDest == NULL) hr = STRSAFE_E_INVALID_PARAMETER; + else hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + while (cchRemaining && cchSrc && (*pszSrc != '\0')) + { + *pszDestEnd++= *pszSrc++; + cchRemaining--; + cchSrc--; + } + if (cchRemaining > 0) + { + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char))); + } + else + { + pszDestEnd--; + cchRemaining++; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + *pszDestEnd = '\0'; + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringCopyNExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cchSrc, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest != 0) || (cbDest != 0)) hr = STRSAFE_E_INVALID_PARAMETER; + } + if (pszSrc == NULL) pszSrc = L""; + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + pszDestEnd = pszDest; + cchRemaining = 0; + if (*pszSrc != L'\0') + { + if (pszDest == NULL) hr = STRSAFE_E_INVALID_PARAMETER; + else hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + while (cchRemaining && cchSrc && (*pszSrc != L'\0')) + { + *pszDestEnd++= *pszSrc++; + cchRemaining--; + cchSrc--; + } + if (cchRemaining > 0) + { + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); + } + else + { + pszDestEnd--; + cchRemaining++; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + *pszDestEnd = L'\0'; + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringCatWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc) +{ + HRESULT hr; + size_t cchDestCurrent; + + hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + hr = StringCopyWorkerA(pszDest + cchDestCurrent, cchDest - cchDestCurrent, pszSrc); + return hr; +} + +HRESULT +StringCatWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc) +{ + HRESULT hr; + size_t cchDestCurrent; + + hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + hr = StringCopyWorkerW(pszDest + cchDestCurrent, cchDest - cchDestCurrent, pszSrc); + return hr; +} + +HRESULT +StringCatExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPTSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cchDestCurrent; + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest == 0) && (cbDest == 0)) + cchDestCurrent = 0; + else + hr = STRSAFE_E_INVALID_PARAMETER; + } + else + { + hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + { + pszDestEnd = pszDest + cchDestCurrent; + cchRemaining = cchDest - cchDestCurrent; + } + } + if (pszSrc == NULL) pszSrc = ""; + } + else + { + hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + { + pszDestEnd = pszDest + cchDestCurrent; + cchRemaining = cchDest - cchDestCurrent; + } + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + if (*pszSrc != '\0') + { + if (pszDest == NULL) hr = STRSAFE_E_INVALID_PARAMETER; + else hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + hr = StringCopyExWorkerA(pszDestEnd, + cchRemaining, + (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)), + pszSrc, + &pszDestEnd, + &cchRemaining, + dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else + if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if (dwFlags & STRSAFE_NULL_ON_FAILURE) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringCatExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cchDestCurrent; + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest == 0) && (cbDest == 0)) cchDestCurrent = 0; + else hr = STRSAFE_E_INVALID_PARAMETER; + } + else + { + hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + { + pszDestEnd = pszDest + cchDestCurrent; + cchRemaining = cchDest - cchDestCurrent; + } + } + if (pszSrc == NULL) pszSrc = L""; + } + else + { + hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + { + pszDestEnd = pszDest + cchDestCurrent; + cchRemaining = cchDest - cchDestCurrent; + } + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + if (*pszSrc != L'\0') + { + if (pszDest == NULL) hr = STRSAFE_E_INVALID_PARAMETER; + else hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + hr = StringCopyExWorkerW(pszDestEnd, + cchRemaining, + (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)), + pszSrc, + &pszDestEnd, + &cchRemaining, + dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if (dwFlags & STRSAFE_NULL_ON_FAILURE) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringCatNWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchMaxAppend) +{ + HRESULT hr; + size_t cchDestCurrent; + + hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + hr = StringCopyNWorkerA(pszDest + cchDestCurrent, cchDest - cchDestCurrent, pszSrc, cchMaxAppend); + return hr; +} + +HRESULT +StringCatNWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchMaxAppend) +{ + HRESULT hr; + size_t cchDestCurrent; + + hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + hr = StringCopyNWorkerW(pszDest + cchDestCurrent, cchDest - cchDestCurrent, pszSrc, cchMaxAppend); + return hr; +} + +HRESULT +StringCatNExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cchMaxAppend, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPTSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + size_t cchDestCurrent = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest == 0) && (cbDest == 0)) cchDestCurrent = 0; + else hr = STRSAFE_E_INVALID_PARAMETER; + } + else + { + hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + { + pszDestEnd = pszDest + cchDestCurrent; + cchRemaining = cchDest - cchDestCurrent; + } + } + if (pszSrc == NULL) pszSrc = ""; + } + else + { + hr = StringLengthWorkerA(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + { + pszDestEnd = pszDest + cchDestCurrent; + cchRemaining = cchDest - cchDestCurrent; + } + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + if (*pszSrc != '\0') + { + if (pszDest == NULL) hr = STRSAFE_E_INVALID_PARAMETER; + else hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + hr = StringCopyNExWorkerA(pszDestEnd, + cchRemaining, + (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)), + pszSrc, + cchMaxAppend, + &pszDestEnd, + &cchRemaining, + dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + } + } + + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringCatNExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cchMaxAppend, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + size_t cchDestCurrent = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest == 0) && (cbDest == 0)) cchDestCurrent = 0; + else hr = STRSAFE_E_INVALID_PARAMETER; + } + else + { + hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + { + pszDestEnd = pszDest + cchDestCurrent; + cchRemaining = cchDest - cchDestCurrent; + } + } + if (pszSrc == NULL) pszSrc = L""; + } + else + { + hr = StringLengthWorkerW(pszDest, cchDest, &cchDestCurrent); + if (SUCCEEDED(hr)) + { + pszDestEnd = pszDest + cchDestCurrent; + cchRemaining = cchDest - cchDestCurrent; + } + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + if (*pszSrc != L'\0') + { + if (pszDest == NULL) hr = STRSAFE_E_INVALID_PARAMETER; + else hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + hr = StringCopyNExWorkerW(pszDestEnd, + cchRemaining, + (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)), + pszSrc, + cchMaxAppend, + &pszDestEnd, + &cchRemaining, + dwFlags & (~(STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE))); + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringVPrintfWorkerA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszFormat, + va_list argList) +{ + HRESULT hr = S_OK; + + if (cchDest == 0) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnprintf(pszDest, cchMax, pszFormat, argList); + if ((iRet < 0) || (((size_t)iRet) > cchMax)) + { + pszDest += cchMax; + *pszDest = '\0'; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + else if (((size_t)iRet) == cchMax) + { + pszDest += cchMax; + *pszDest = '\0'; + } + } + return hr; +} + +HRESULT +StringVPrintfWorkerW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszFormat, + va_list argList) +{ + HRESULT hr = S_OK; + + if (cchDest == 0) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList); + if ((iRet < 0) || (((size_t)iRet) > cchMax)) + { + pszDest += cchMax; + *pszDest = L'\0'; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + else if (((size_t)iRet) == cchMax) + { + pszDest += cchMax; + *pszDest = L'\0'; + } + } + return hr; +} + +HRESULT +StringVPrintfExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags, + LPCTSTR pszFormat, + va_list argList) +{ + HRESULT hr = S_OK; + LPTSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest != 0) || (cbDest != 0)) + hr = STRSAFE_E_INVALID_PARAMETER; + } + if (pszFormat == NULL) pszFormat = ""; + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + pszDestEnd = pszDest; + cchRemaining = 0; + if (*pszFormat != '\0') + { + if (pszDest == NULL) hr = STRSAFE_E_INVALID_PARAMETER; + else hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnprintf(pszDest, cchMax, pszFormat, argList); + if ((iRet < 0) || (((size_t)iRet) > cchMax)) + { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = '\0'; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + else if (((size_t)iRet) == cchMax) + { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + else if (((size_t)iRet) < cchMax) + { + pszDestEnd = pszDest + iRet; + cchRemaining = cchDest - iRet; + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char))); + } + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringVPrintfExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags, + LPCWSTR pszFormat, + va_list argList) +{ + HRESULT hr = S_OK; + LPWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest != 0) || (cbDest != 0)) + hr = STRSAFE_E_INVALID_PARAMETER; + } + + if (pszFormat == NULL) pszFormat = L""; + } + if (SUCCEEDED(hr)) + { + if (cchDest == 0) + { + pszDestEnd = pszDest; + cchRemaining = 0; + if (*pszFormat != L'\0') + { + if (pszDest == NULL) hr = STRSAFE_E_INVALID_PARAMETER; + else hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + } + else + { + int iRet; + size_t cchMax; + cchMax = cchDest - 1; + iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList); + if ((iRet < 0) || (((size_t)iRet) > cchMax)) + { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = L'\0'; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + else if (((size_t)iRet) == cchMax) + { + pszDestEnd = pszDest + cchMax; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + else if (((size_t)iRet) < cchMax) + { + pszDestEnd = pszDest + iRet; + cchRemaining = cchDest - iRet; + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); + } + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +HRESULT +StringLengthWorkerA(LPCTSTR psz, + size_t cchMax, + size_t* pcch) +{ + HRESULT hr = S_OK; + size_t cchMaxPrev = cchMax; + + while (cchMax && (*psz != '\0')) psz++, cchMax--; + if (cchMax == 0) hr = STRSAFE_E_INVALID_PARAMETER; + if (SUCCEEDED(hr) && pcch) *pcch = cchMaxPrev - cchMax; + return hr; +} + +HRESULT +StringLengthWorkerW(LPCWSTR psz, + size_t cchMax, + size_t* pcch) +{ + HRESULT hr = S_OK; + size_t cchMaxPrev = cchMax; + + while (cchMax && (*psz != L'\0')) psz++, cchMax--; + if (cchMax == 0) hr = STRSAFE_E_INVALID_PARAMETER; + if (SUCCEEDED(hr) && pcch) *pcch = cchMaxPrev - cchMax; + return hr; +} + +STRSAFE_INLINE_API +StringGetsExWorkerA(LPTSTR pszDest, + size_t cchDest, + size_t cbDest, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPTSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest != 0) || (cbDest != 0)) + hr = STRSAFE_E_INVALID_PARAMETER; + } + } + if (SUCCEEDED(hr)) + { + if (cchDest <= 1) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + if (cchDest == 1) *pszDestEnd = '\0'; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + else + { + char ch; + pszDestEnd = pszDest; + cchRemaining = cchDest; + while ((cchRemaining > 1) && (ch = (char)getc(stdin)) != '\n') + { + if (ch == EOF) + { + if (pszDestEnd == pszDest) + hr = STRSAFE_E_END_OF_FILE; + break; + } + *pszDestEnd = ch; + pszDestEnd++; + cchRemaining--; + } + if (cchRemaining > 0) + { + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(char)) + (cbDest % sizeof(char))); + } + *pszDestEnd = '\0'; + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = '\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = '\0'; + } + } + } + } + if (SUCCEEDED(hr) || + (hr == STRSAFE_E_INSUFFICIENT_BUFFER) || + (hr == STRSAFE_E_END_OF_FILE)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +STRSAFE_INLINE_API +StringGetsExWorkerW(LPWSTR pszDest, + size_t cchDest, + size_t cbDest, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags) +{ + HRESULT hr = S_OK; + LPWSTR pszDestEnd = pszDest; + size_t cchRemaining = 0; + + if (dwFlags & (~STRSAFE_VALID_FLAGS)) hr = STRSAFE_E_INVALID_PARAMETER; + else + { + if (dwFlags & STRSAFE_IGNORE_NULLS) + { + if (pszDest == NULL) + { + if ((cchDest != 0) || (cbDest != 0)) + hr = STRSAFE_E_INVALID_PARAMETER; + } + } + + if (SUCCEEDED(hr)) + { + if (cchDest <= 1) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + if (cchDest == 1) *pszDestEnd = L'\0'; + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + else + { + wchar_t ch; + pszDestEnd = pszDest; + cchRemaining = cchDest; + while ((cchRemaining > 1) && (ch = (wchar_t)getwc(stdin)) != L'\n') + { + if (ch == (wchar_t)EOF) + { + if (pszDestEnd == pszDest) + hr = STRSAFE_E_END_OF_FILE; + break; + } + *pszDestEnd = ch; + pszDestEnd++; + cchRemaining--; + } + if (cchRemaining > 0) + { + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + memset(pszDestEnd + 1, STRSAFE_GET_FILL_PATTERN(dwFlags), ((cchRemaining - 1) * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t))); + } + *pszDestEnd = L'\0'; + } + } + } + if (FAILED(hr)) + { + if (pszDest) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + memset(pszDest, STRSAFE_GET_FILL_PATTERN(dwFlags), cbDest); + if (STRSAFE_GET_FILL_PATTERN(dwFlags) == 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + } + else if (cchDest > 0) + { + pszDestEnd = pszDest + cchDest - 1; + cchRemaining = 1; + *pszDestEnd = L'\0'; + } + } + if (dwFlags & (STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION)) + { + if (cchDest > 0) + { + pszDestEnd = pszDest; + cchRemaining = cchDest; + *pszDestEnd = L'\0'; + } + } + } + } + if (SUCCEEDED(hr) || + (hr == STRSAFE_E_INSUFFICIENT_BUFFER) || + (hr == STRSAFE_E_END_OF_FILE)) + { + if (ppszDestEnd) *ppszDestEnd = pszDestEnd; + if (pcchRemaining) *pcchRemaining = cchRemaining; + } + return hr; +} + +STRSAFEAPI +StringCchCatA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc) +{ + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCatWorkerA(pszDest, cchDest, pszSrc); +} + +STRSAFEAPI +StringCchCatW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc) +{ + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCatWorkerW(pszDest, cchDest, pszSrc); +} + +STRSAFEAPI +StringCchCatExA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(char); + hr = StringCatExWorkerA(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags); + } + return hr; +} + +STRSAFEAPI +StringCchCatExW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(wchar_t); + hr = StringCatExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags); + } + + return hr; +} + +STRSAFEAPI +StringCchCatNA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchMaxAppend) +{ + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCatNWorkerA(pszDest, cchDest, pszSrc, cchMaxAppend); +} + +STRSAFEAPI +StringCchCatNW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchMaxAppend) +{ + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCatNWorkerW(pszDest, cchDest, pszSrc, cchMaxAppend); +} + +STRSAFEAPI +StringCchCatNExA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchMaxAppend, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(char); + hr = StringCatNExWorkerA(pszDest, cchDest, cbDest, pszSrc, cchMaxAppend, ppszDestEnd, pcchRemaining, dwFlags); + } + return hr; +} + +STRSAFEAPI +StringCchCatNExW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchMaxAppend, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(wchar_t); + hr = StringCatNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchMaxAppend, ppszDestEnd, pcchRemaining, dwFlags); + } + + return hr; +} + +STRSAFEAPI +StringCchCopyA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc) +{ + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCopyWorkerA(pszDest, cchDest, pszSrc); +} + +STRSAFEAPI +StringCchCopyW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc) +{ + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCopyWorkerW(pszDest, cchDest, pszSrc); +} + +STRSAFEAPI +StringCchCopyExA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(char); + hr = StringCopyExWorkerA(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags); + } + return hr; +} + +STRSAFEAPI +StringCchCopyExW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(wchar_t); + hr = StringCopyExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, pcchRemaining, dwFlags); + } + return hr; +} + +STRSAFEAPI +StringCchCopyNA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchSrc) +{ + if ((cchDest > STRSAFE_MAX_CCH) || (cchSrc > STRSAFE_MAX_CCH)) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCopyNWorkerA(pszDest, cchDest, pszSrc, cchSrc); +} + +STRSAFEAPI +StringCchCopyNW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchSrc) +{ + if ((cchDest > STRSAFE_MAX_CCH) || (cchSrc > STRSAFE_MAX_CCH)) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCopyNWorkerW(pszDest, cchDest, pszSrc, cchSrc); +} + +STRSAFEAPI +StringCchCopyNExA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchSrc, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if ((cchDest > STRSAFE_MAX_CCH) || + (cchSrc > STRSAFE_MAX_CCH)) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(char); + hr = StringCopyNExWorkerA(pszDest, cchDest, cbDest, pszSrc, cchSrc, ppszDestEnd, pcchRemaining, dwFlags); + } + return hr; +} + +STRSAFEAPI +StringCchCopyNExW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchSrc, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if ((cchDest > STRSAFE_MAX_CCH) || + (cchSrc > STRSAFE_MAX_CCH)) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(wchar_t); + hr = StringCopyNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchSrc, ppszDestEnd, pcchRemaining, dwFlags); + } + return hr; +} + +STRSAFE_INLINE_API +StringCchGetsA(LPTSTR pszDest, + size_t cchDest) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(char); + hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, NULL, NULL, 0); + } + return hr; +} + +STRSAFE_INLINE_API +StringCchGetsW(LPWSTR pszDest, + size_t cchDest) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(wchar_t); + hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, NULL, NULL, 0); + } + return hr; +} + +STRSAFE_INLINE_API +StringCchGetsExA(LPTSTR pszDest, + size_t cchDest, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(char); + hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags); + } + return hr; +} + +STRSAFE_INLINE_API +StringCchGetsExW(LPWSTR pszDest, + size_t cchDest, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(wchar_t); + hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags); + } + return hr; +} + +STRSAFEAPI +StringCchPrintfA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszFormat, + ...) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + va_list argList; + va_start(argList, pszFormat); + hr = StringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList); + va_end(argList); + } + return hr; +} + +STRSAFEAPI +StringCchPrintfW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszFormat, + ...) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + va_list argList; + va_start(argList, pszFormat); + hr = StringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); + va_end(argList); + } + return hr; +} + +STRSAFEAPI +StringCchPrintfExA(LPTSTR pszDest, + size_t cchDest, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags, + LPCTSTR pszFormat, + ...) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + va_list argList; + cbDest = cchDest * sizeof(char); + va_start(argList, pszFormat); + hr = StringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList); + va_end(argList); + } + return hr; +} + +STRSAFEAPI +StringCchPrintfExW(LPWSTR pszDest, + size_t cchDest, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags, + LPCWSTR pszFormat, + ...) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + va_list argList; + cbDest = cchDest * sizeof(wchar_t); + va_start(argList, pszFormat); + hr = StringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList); + va_end(argList); + } + return hr; +} + +STRSAFEAPI +StringCchVPrintfA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszFormat, + va_list argList) +{ + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList); +} + +STRSAFEAPI +StringCchVPrintfW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszFormat, + va_list argList) +{ + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); +} + +STRSAFEAPI +StringCchVPrintfExA(LPTSTR pszDest, + size_t cchDest, + LPTSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags, + LPCTSTR pszFormat, + va_list argList) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(char); + hr = StringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList); + } + return hr; +} + +STRSAFEAPI +StringCchVPrintfExW(LPWSTR pszDest, + size_t cchDest, + LPWSTR *ppszDestEnd, + size_t *pcchRemaining, + DWORD dwFlags, + LPCWSTR pszFormat, + va_list argList) +{ + HRESULT hr; + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cbDest; + cbDest = cchDest * sizeof(wchar_t); + hr = StringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, pcchRemaining, dwFlags, pszFormat, argList); + } + return hr; +} + +STRSAFEAPI +StringCchLengthA(LPCTSTR psz, + size_t cchMax, + size_t *pcch) +{ + if ((psz == NULL) || (cchMax > STRSAFE_MAX_CCH)) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringLengthWorkerA(psz, cchMax, pcch); +} + +STRSAFEAPI +StringCchLengthW(LPCWSTR psz, + size_t cchMax, + size_t *pcch) +{ + if ((psz == NULL) || (cchMax > STRSAFE_MAX_CCH)) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringLengthWorkerW(psz, cchMax, pcch); +} + +STRSAFEAPI +StringCbCatA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc) +{ + size_t cchDest; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCatWorkerA(pszDest, cchDest, pszSrc); +} + +STRSAFEAPI +StringCbCatW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc) +{ + size_t cchDest; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCatWorkerW(pszDest, cchDest, pszSrc); +} + +STRSAFEAPI +StringCbCatExA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringCatExWorkerA(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags); + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + } + return hr; +} + +STRSAFEAPI +StringCbCatExW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringCatExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags); + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + } + return hr; +} + +STRSAFEAPI +StringCbCatNA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cbMaxAppend) +{ + HRESULT hr; + size_t cchDest; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cchMaxAppend; + cchMaxAppend = cbMaxAppend / sizeof(char); + hr = StringCatNWorkerA(pszDest, cchDest, pszSrc, cchMaxAppend); + } + return hr; +} + +STRSAFEAPI +StringCbCatNW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cbMaxAppend) +{ + HRESULT hr; + size_t cchDest; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cchMaxAppend; + cchMaxAppend = cbMaxAppend / sizeof(wchar_t); + hr = StringCatNWorkerW(pszDest, cchDest, pszSrc, cchMaxAppend); + } + return hr; +} + +STRSAFEAPI +StringCbCatNExA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cbMaxAppend, + LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cchMaxAppend; + cchMaxAppend = cbMaxAppend / sizeof(char); + hr = StringCatNExWorkerA(pszDest, cchDest, cbDest, pszSrc, cchMaxAppend, ppszDestEnd, &cchRemaining, dwFlags); + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + } + + return hr; +} + +STRSAFEAPI +StringCbCatNExW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cbMaxAppend, + LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + size_t cchMaxAppend; + cchMaxAppend = cbMaxAppend / sizeof(wchar_t); + hr = StringCatNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchMaxAppend, ppszDestEnd, &cchRemaining, dwFlags); + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + } + return hr; +} + +STRSAFEAPI +StringCbCopyA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc) +{ + size_t cchDest; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCopyWorkerA(pszDest, cchDest, pszSrc); +} + +STRSAFEAPI +StringCbCopyW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc) +{ + size_t cchDest; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCopyWorkerW(pszDest, cchDest, pszSrc); +} + +STRSAFEAPI +StringCbCopyExA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(char); + + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringCopyExWorkerA(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags); + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + } + + return hr; +} + +STRSAFEAPI +StringCbCopyExW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringCopyExWorkerW(pszDest, cchDest, cbDest, pszSrc, ppszDestEnd, &cchRemaining, dwFlags); + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + } + + return hr; +} + +STRSAFEAPI +StringCbCopyNA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cbSrc) +{ + size_t cchDest; + size_t cchSrc; + + cchDest = cbDest / sizeof(char); + cchSrc = cbSrc / sizeof(char); + if ((cchDest > STRSAFE_MAX_CCH) || (cchSrc > STRSAFE_MAX_CCH)) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCopyNWorkerA(pszDest, cchDest, pszSrc, cchSrc); +} + +STRSAFEAPI +StringCbCopyNW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cbSrc) +{ + size_t cchDest; + size_t cchSrc; + + cchDest = cbDest / sizeof(wchar_t); + cchSrc = cbSrc / sizeof(wchar_t); + if ((cchDest > STRSAFE_MAX_CCH) || (cchSrc > STRSAFE_MAX_CCH)) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringCopyNWorkerW(pszDest, cchDest, pszSrc, cchSrc); +} + +STRSAFEAPI +StringCbCopyNExA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cbSrc, + LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchSrc; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(char); + cchSrc = cbSrc / sizeof(char); + if ((cchDest > STRSAFE_MAX_CCH) || + (cchSrc > STRSAFE_MAX_CCH)) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringCopyNExWorkerA(pszDest, cchDest, cbDest, pszSrc, cchSrc, ppszDestEnd, &cchRemaining, dwFlags); + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + } + return hr; +} + +STRSAFEAPI +StringCbCopyNExW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cbSrc, + LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchSrc; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(wchar_t); + cchSrc = cbSrc / sizeof(wchar_t); + if ((cchDest > STRSAFE_MAX_CCH) || + (cchSrc > STRSAFE_MAX_CCH)) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringCopyNExWorkerW(pszDest, cchDest, cbDest, pszSrc, cchSrc, ppszDestEnd, &cchRemaining, dwFlags); + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + } + return hr; +} + +STRSAFE_INLINE_API +StringCbGetsA(LPTSTR pszDest, + size_t cbDest) +{ + size_t cchDest; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringGetsExWorkerA(pszDest, cchDest, cbDest, NULL, NULL, 0); +} + +STRSAFE_INLINE_API +StringCbGetsW(LPWSTR pszDest, + size_t cbDest) +{ + size_t cchDest; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringGetsExWorkerW(pszDest, cchDest, cbDest, NULL, NULL, 0); +} + +STRSAFE_INLINE_API +StringCbGetsExA(LPTSTR pszDest, + size_t cbDest, + LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringGetsExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags); + if (SUCCEEDED(hr) || + (hr == STRSAFE_E_INSUFFICIENT_BUFFER) || + (hr == STRSAFE_E_END_OF_FILE)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + } + return hr; +} + +STRSAFE_INLINE_API +StringCbGetsExW(LPWSTR pszDest, + size_t cbDest, + LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringGetsExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags); + if (SUCCEEDED(hr) || + (hr == STRSAFE_E_INSUFFICIENT_BUFFER) || + (hr == STRSAFE_E_END_OF_FILE)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + } + return hr; +} + +STRSAFEAPI +StringCbPrintfA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszFormat, + ...) +{ + HRESULT hr; + size_t cchDest; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + va_list argList; + va_start(argList, pszFormat); + hr = StringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList); + va_end(argList); + } + return hr; +} + +STRSAFEAPI +StringCbPrintfW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszFormat, + ...) +{ + HRESULT hr; + size_t cchDest; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + va_list argList; + va_start(argList, pszFormat); + hr = StringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); + va_end(argList); + } + return hr; +} + +STRSAFEAPI +StringCbPrintfExA(LPTSTR pszDest, + size_t cbDest, + LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags, + LPCTSTR pszFormat, + ...) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + va_list argList; + va_start(argList, pszFormat); + hr = StringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList); + va_end(argList); + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + } + return hr; +} + +STRSAFEAPI +StringCbPrintfExW(LPWSTR pszDest, + size_t cbDest, + LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags, + LPCWSTR pszFormat, + ...) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + { + va_list argList; + va_start(argList, pszFormat); + hr = StringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList); + va_end(argList); + } + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + } + return hr; +} + +STRSAFEAPI +StringCbVPrintfA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszFormat, + va_list argList) +{ + size_t cchDest; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringVPrintfWorkerA(pszDest, cchDest, pszFormat, argList); +} + +STRSAFEAPI +StringCbVPrintfW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszFormat, + va_list argList) +{ + size_t cchDest; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + return STRSAFE_E_INVALID_PARAMETER; + else + return StringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); +} + +STRSAFEAPI +StringCbVPrintfExA(LPTSTR pszDest, + size_t cbDest, + LPTSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags, + LPCTSTR pszFormat, + va_list argList) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(char); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringVPrintfExWorkerA(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList); + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(char)) + (cbDest % sizeof(char)); + } + return hr; +} + +STRSAFEAPI +StringCbVPrintfExW(LPWSTR pszDest, + size_t cbDest, + LPWSTR *ppszDestEnd, + size_t *pcbRemaining, + DWORD dwFlags, + LPCWSTR pszFormat, + va_list argList) +{ + HRESULT hr; + size_t cchDest; + size_t cchRemaining = 0; + + cchDest = cbDest / sizeof(wchar_t); + if (cchDest > STRSAFE_MAX_CCH) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringVPrintfExWorkerW(pszDest, cchDest, cbDest, ppszDestEnd, &cchRemaining, dwFlags, pszFormat, argList); + if (SUCCEEDED(hr) || (hr == STRSAFE_E_INSUFFICIENT_BUFFER)) + { + if (pcbRemaining) + *pcbRemaining = (cchRemaining * sizeof(wchar_t)) + (cbDest % sizeof(wchar_t)); + } + return hr; +} + +STRSAFEAPI +StringCbLengthA(LPCTSTR psz, + size_t cbMax, + size_t *pcb) +{ + HRESULT hr; + size_t cchMax; + size_t cch = 0; + + cchMax = cbMax / sizeof(char); + if ((psz == NULL) || (cchMax > STRSAFE_MAX_CCH)) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringLengthWorkerA(psz, cchMax, &cch); + if (SUCCEEDED(hr) && pcb) *pcb = cch * sizeof(char); + return hr; +} + +STRSAFEAPI +StringCbLengthW(LPCWSTR psz, + size_t cbMax, + size_t *pcb) +{ + HRESULT hr; + size_t cchMax; + size_t cch = 0; + + cchMax = cbMax / sizeof(wchar_t); + if ((psz == NULL) || (cchMax > STRSAFE_MAX_CCH)) + hr = STRSAFE_E_INVALID_PARAMETER; + else + hr = StringLengthWorkerW(psz, cchMax, &cch); + if (SUCCEEDED(hr) && pcb) *pcb = cch * sizeof(wchar_t); + return hr; +} Propchange: trunk/reactos/lib/sdk/strsafe/strsafe.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/strsafe/strsafe.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/strsafe/strsafe.rb… ============================================================================== --- trunk/reactos/lib/sdk/strsafe/strsafe.rbuild (added) +++ trunk/reactos/lib/sdk/strsafe/strsafe.rbuild Sat Dec 29 18:16:35 2007 @@ -1,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="strsafe" type="staticlibrary" allowwarnings="true"> + <define name="_DISABLE_TIDENTS" /> + <file>strsafe.c</file> +</module> Propchange: trunk/reactos/lib/sdk/strsafe/strsafe.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 31490: Header file for strsafe library (Part 1/2)
by dchapyshev＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: dchapyshev Date: Sat Dec 29 18:12:34 2007 New Revision: 31490 URL: http://svn.reactos.org/svn/reactos?rev=31490&view=rev Log: Header file for strsafe library (Part 1/2) Added: trunk/reactos/include/psdk/strsafe.h (with props) Added: trunk/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/strsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/strsafe.h (added) +++ trunk/reactos/include/psdk/strsafe.h Sat Dec 29 18:12:34 2007 @@ -1,0 +1,442 @@ +/* + * STRSAFE + * + * Copyright 2007 Dmitry Chapyshev <dmitry(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef _STRSAFE_H_INCLUDED_ +#define _STRSAFE_H_INCLUDED_ + +#ifdef __cplusplus +#define _STRSAFE_EXTERN_C extern "C" +extern "C" { +#else +#define _STRSAFE_EXTERN_C extern +#endif + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <windows.h> + +#define STRSAFE_INLINE_API __inline HRESULT __stdcall +#define STRSAFEAPI _STRSAFE_EXTERN_C HRESULT __stdcall + +#ifndef _NTSTRSAFE_H_INCLUDED_ + +#define STRSAFE_MAX_CCH 2147483647 + +#define STRSAFE_FILL_BEHIND_NULL 0x00000200 +#define STRSAFE_IGNORE_NULLS 0x00000100 +#define STRSAFE_FILL_ON_FAILURE 0x00000400 +#define STRSAFE_NULL_ON_FAILURE 0x00000800 +#define STRSAFE_NO_TRUNCATION 0x00001000 +#define STRSAFE_IGNORE_NULL_UNICODE_STRINGS 0x00010000 +#define STRSAFE_UNICODE_STRING_DEST_NULL_TERMINATED 0x00020000 + +#define STRSAFE_VALID_FLAGS (0x000000FF | STRSAFE_IGNORE_NULLS | STRSAFE_FILL_BEHIND_NULL | STRSAFE_FILL_ON_FAILURE | STRSAFE_NULL_ON_FAILURE | STRSAFE_NO_TRUNCATION) +#define STRSAFE_UNICODE_STRING_VALID_FLAGS (STRSAFE_VALID_FLAGS | STRSAFE_IGNORE_NULL_UNICODE_STRINGS | STRSAFE_UNICODE_STRING_DEST_NULL_TERMINATED) +#define STRSAFE_FILL_BYTE(x) ((unsigned long)((x & 0x000000FF) | STRSAFE_FILL_BEHIND_NULL)) +#define STRSAFE_FAILURE_BYTE(x) ((unsigned long)((x & 0x000000FF) | STRSAFE_FILL_ON_FAILURE)) +#define STRSAFE_GET_FILL_PATTERN(dwFlags) ((int)(dwFlags & 0x000000FF)) + +#endif /* _NTSTRSAFE_H_INCLUDED_ */ + +#define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) +#define STRSAFE_E_INVALID_PARAMETER ((HRESULT)0x80070057L) +#define STRSAFE_E_END_OF_FILE ((HRESULT)0x80070026L) + +#ifndef STRSAFE_NO_CCH_FUNCTIONS +STRSAFEAPI +StringCchCatA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc); + +STRSAFEAPI +StringCchCatW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc); + +STRSAFEAPI +StringCchCatExA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCchCatExW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCchCatNA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchMaxAppend); + +STRSAFEAPI +StringCchCatNW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchMaxAppend); + +STRSAFEAPI +StringCchCatNExA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchMaxAppend, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCchCatNExW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchMaxAppend, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCchCopyA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc); + +STRSAFEAPI +StringCchCopyW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc); + +STRSAFEAPI +StringCchCopyExA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCchCopyExW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCchCopyNA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchSrc); + +STRSAFEAPI +StringCchCopyNW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchSrc); + +STRSAFEAPI +StringCchCopyNExA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszSrc, + size_t cchSrc, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCchCopyNExW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszSrc, + size_t cchSrc, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFE_INLINE_API +StringCchGetsA(LPTSTR pszDest, + size_t cchDest); + +STRSAFE_INLINE_API +StringCchGetsW(LPWSTR pszDest, + size_t cchDest); + +STRSAFE_INLINE_API +StringCchGetsExA(LPTSTR pszDest, + size_t cchDest, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFE_INLINE_API +StringCchGetsExW(LPWSTR pszDest, + size_t cchDest, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCchVPrintfA(LPTSTR pszDest, + size_t cchDest, + LPCTSTR pszFormat, + va_list argList); + +STRSAFEAPI +StringCchVPrintfW(LPWSTR pszDest, + size_t cchDest, + LPCWSTR pszFormat, + va_list argList); + +STRSAFEAPI +StringCchVPrintfExA(LPTSTR pszDest, + size_t cchDest, + LPTSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags, + LPCTSTR pszFormat, + va_list argList); + +STRSAFEAPI +StringCchVPrintfExW(LPWSTR pszDest, + size_t cchDest, + LPWSTR *ppszDestEnd, + size_t* pcchRemaining, + unsigned long dwFlags, + LPCWSTR pszFormat, + va_list argList); + +STRSAFEAPI +StringCchLengthA(LPCTSTR psz, + size_t cchMax, + size_t* pcch); + +STRSAFEAPI +StringCchLengthW(LPCWSTR psz, + size_t cchMax, + size_t* pcch); +#endif /* STRSAFE_NO_CCH_FUNCTIONS */ + +/* CB */ +#ifndef STRSAFE_NO_CB_FUNCTIONS +STRSAFEAPI +StringCbCatA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc); + +STRSAFEAPI +StringCbCatW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc); + +STRSAFEAPI +StringCbCatExA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCbCatExW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCbCopyA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc); + +STRSAFEAPI +StringCbCopyW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc); + +STRSAFEAPI +StringCbCopyExA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + LPTSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCbCopyExW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + LPWSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCbCopyNA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cbSrc); + +STRSAFEAPI +StringCbCopyNW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cbSrc); + +STRSAFEAPI +StringCbCopyNExA(LPTSTR pszDest, + size_t cbDest, + LPCTSTR pszSrc, + size_t cbSrc, + LPTSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCbCopyNExW(LPWSTR pszDest, + size_t cbDest, + LPCWSTR pszSrc, + size_t cbSrc, + LPWSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags); + +STRSAFE_INLINE_API +StringCbGetsA(LPTSTR pszDest, + size_t cbDest); + +STRSAFE_INLINE_API +StringCbGetsW(LPWSTR pszDest, + size_t cbDest); + +STRSAFE_INLINE_API +StringCbGetsExA(LPTSTR pszDest, + size_t cbDest, + LPTSTR *ppszDestEnd, + size_t* pbRemaining, + unsigned long dwFlags); + +STRSAFE_INLINE_API +StringCbGetsExW(LPWSTR pszDest, + size_t cbDest, + LPWSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags); + +STRSAFEAPI +StringCbPrintfExA(LPTSTR pszDest, + size_t cbDest, + LPTSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags, + LPCTSTR pszFormat, + ...); + +STRSAFEAPI +StringCbPrintfExW(LPWSTR pszDest, + size_t cbDest, + LPWSTR *ppszDestEnd, + size_t* pcbRemaining, + unsigned long dwFlags, + LPCWSTR pszFormat, + ...); +#endif /* STRSAFE_NO_CB_FUNCTIONS */ + +#ifdef UNICODE +#ifndef STRSAFE_NO_CCH_FUNCTIONS +#define StringCchCat StringCchCatW +#define StringCchCatEx StringCchCatExW +#define StringCchCatN StringCchCatNW +#define StringCchCatNEx StringCchCatNExW +#define StringCchCopy StringCchCopyW +#define StringCchCopyEx StringCchCopyExW +#define StringCchCopyN StringCchCopyNW +#define StringCchCopyNEx StringCchCopyNExW +#define StringCchGets StringCchGetsW +#define StringCchGetsEx StringCchGetsExW +#define StringCchPrintf StringCchPrintfW +#define StringCchPrintfEx StringCchPrintfExW +#define StringCchVPrintf StringCchVPrintfW +#define StringCchVPrintfEx StringCchVPrintfExW +#define StringCchLength StringCchLengthW +#endif /* STRSAFE_NO_CCH_FUNCTIONS */ + +#ifndef STRSAFE_NO_CB_FUNCTIONS +#define StringCbCat StringCbCatW +#define StringCbCatEx StringCbCatExW +#define StringCbCatN StringCbCatNW +#define StringCbCatNEx StringCbCatNExW +#define StringCbCopy StringCbCopyW +#define StringCbCopyEx StringCbCopyExW +#define StringCbCopyN StringCbCopyNW +#define StringCbCopyNEx StringCbCopyNExW +#define StringCbGets StringCbGetsW +#define StringCbGetsEx StringCbGetsExW +#define StringCbPrintf StringCbPrintfW +#define StringCbPrintfEx StringCbPrintfExW +#define StringCbVPrintf StringCbVPrintfW +#define StringCbVPrintfEx StringCbVPrintfExW +#define StringCbLenght StringCbLenghtW +#endif /* STRSAFE_NO_CB_FUNCTIONS */ + +#else +#ifndef STRSAFE_NO_CCH_FUNCTIONS +#define StringCchCat StringCchCatA +#define StringCchCatEx StringCchCatExA +#define StringCchCatN StringCchCatNA +#define StringCchCatNEx StringCchCatNExA +#define StringCchCopy StringCchCopyA +#define StringCchCopyEx StringCchCopyExA +#define StringCchCopyN StringCchCopyNA +#define StringCchCopyNEx StringCchCopyNExA +#define StringCchGets StringCchGetsA +#define StringCchGetsEx StringCchGetsExA +#define StringCchPrintf StringCchPrintfA +#define StringCchPrintfEx StringCchPrintfExA +#define StringCchVPrintf StringCchVPrintfA +#define StringCchVPrintfEx StringCchVPrintfExA +#define StringCchLength StringCchLengthA +#endif /* STRSAFE_NO_CCH_FUNCTIONS */ + +#ifndef STRSAFE_NO_CB_FUNCTIONS +#define StringCbCat StringCbCatA +#define StringCbCatEx StringCbCatExA +#define StringCbCatN StringCbCatNA +#define StringCbCatNEx StringCbCatNExA +#define StringCbCopy StringCbCopyA +#define StringCbCopyEx StringCbCopyExA +#define StringCbCopyN StringCbCopyNA +#define StringCbCopyNEx StringCbCopyNExA +#define StringCbGets StringCbGetsA +#define StringCbGetsEx StringCbGetsExA +#define StringCbPrintf StringCbPrintfA +#define StringCbPrintfEx StringCbPrintfExA +#define StringCbVPrintf StringCbVPrintfA +#define StringCbVPrintfEx StringCbVPrintfExA +#define StringCbLenght StringCbLenghtA +#endif /* STRSAFE_NO_CB_FUNCTIONS */ +#endif /* UNICODE */ + +#ifdef __cplusplus +} +#endif /* cplusplus */ + +#endif /* _STRSAFE_H_INCLUDED_ */ Propchange: trunk/reactos/include/psdk/strsafe.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gbrunmar] 31489: Added missing display device state flags to wingdi.h
by gbrunmar＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: gbrunmar Date: Sat Dec 29 17:30:56 2007 New Revision: 31489 URL: http://svn.reactos.org/svn/reactos?rev=31489&view=rev Log: Added missing display device state flags to wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Sat Dec 29 17:30:56 2007 @@ -1223,6 +1223,8 @@ #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 #define DISPLAY_DEVICE_REMOVABLE 0x00000020 +#define DISPLAY_DEVICE_DISCONNECT 0x02000000 +#define DISPLAY_DEVICE_REMOTE 0x04000000 #define DISPLAY_DEVICE_MODESPRUNED 0x08000000 #ifndef RC_INVOKED typedef struct _ABC {

1 0

[greatlrd] 31488: update the docummactions of DxEngSetDeviceGammaRamp
by greatlrd＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: greatlrd Date: Sat Dec 29 15:48:49 2007 New Revision: 31488 URL: http://svn.reactos.org/svn/reactos?rev=31488&view=rev Log: update the docummactions of DxEngSetDeviceGammaRamp Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sat Dec 29 15:48:49 2007 @@ -291,9 +291,8 @@ * @param PGAMMARAMP Ramp * to set in our gama ramp * -* @param BOOL Unuse -* Info on this are avail at request. at moment ReactOS does not -* does not use it. and problare never need it. +* @param BOOL Test +* Testing the gama or not. FALSE for no test, TRUE for testing * * @return * This return FALSE or TRUE, FALSE for fail, TRUE for success

1 0

[dchapyshev] 31487: - Fix typo
by dchapyshev＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: dchapyshev Date: Sat Dec 29 15:33:35 2007 New Revision: 31487 URL: http://svn.reactos.org/svn/reactos?rev=31487&view=rev Log: - Fix typo Modified: trunk/reactos/include/dxsdk/amvideo.h Modified: trunk/reactos/include/dxsdk/amvideo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amvideo.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/amvideo.h (original) +++ trunk/reactos/include/dxsdk/amvideo.h Sat Dec 29 15:33:35 2007 @@ -173,7 +173,7 @@ STDMETHOD(SetCaption)(THIS_ BSTR strCaption) PURE; STDMETHOD(GetCaption)(THIS_ BSTR *pstrCaption) PURE; STDMETHOD(SetDefault)(THIS) PURE; -} +}; #undef INTERFACE #define INTERFACE IQualProp

1 0

[jimtabor] 31486: Fix set device gamma ramp. Now we test the range of the ramp.
by jimtabor＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: jimtabor Date: Sat Dec 29 09:39:06 2007 New Revision: 31486 URL: http://svn.reactos.org/svn/reactos?rev=31486&view=rev Log: Fix set device gamma ramp. Now we test the range of the ramp. Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h Sat Dec 29 09:39:06 2007 @@ -123,6 +123,6 @@ /* Gammaramp internal prototype */ BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); -BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); +BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL); #endif /* _INT_W32k_DDRAW */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sat Dec 29 09:39:06 2007 @@ -303,9 +303,9 @@ * *--*/ BOOL -DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse) -{ - return IntSetDeviceGammaRamp(hPDev, Ramp); +DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) +{ + return IntSetDeviceGammaRamp(hPDev, Ramp, Test); } /************************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c Sat Dec 29 09:39:06 2007 @@ -245,11 +245,17 @@ return FALSE; } +// +// ICM registry subkey sets internal brightness range, gamma range is 128 or +// 256 when icm is init. +INT IcmGammaRangeSet = 128; // <- make it global + BOOL FASTCALL -IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) -{ - BOOL Ret = FALSE; +IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) +{ + WORD IcmGR, i, R, G, B; + BOOL Ret = FALSE, TstPeak; PGDIDEVICE pGDev = (PGDIDEVICE) hPDev; if (!hPDev) return FALSE; @@ -274,15 +280,40 @@ if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) if (RtlCompareMemory( pGDev->pvGammaRamp, Ramp, sizeof(GAMMARAMP)) == sizeof(GAMMARAMP)) return TRUE; - + // Verify Ramp is inside range. + IcmGR = -IcmGammaRangeSet; + TstPeak = (Test == FALSE); + for (i = 0; i < 256; i++) + { + R = Ramp->Red[i] / 256; + G = Ramp->Green[i] / 256; + B = Ramp->Blue[i] / 256; + if ( R >= IcmGR) + { + if ( R <= IcmGammaRangeSet + i) + { + if ( G >= IcmGR && + (G <= IcmGammaRangeSet + i) && + B >= IcmGR && + (B <= IcmGammaRangeSet + i) ) continue; + } + } + if (Test) return Ret; // Don't set and return. + // No test override, check max range + if (TstPeak) + { + if ( R != (IcmGR * 256) || + G != (IcmGR * 256) || + B != (IcmGR * 256) ) TstPeak = FALSE; // W/i range. + } + } + // ReactOS allocates a ramp even if it is 8BPP and Palette only. + // This way we have a record of the change in memory. if (!pGDev->pvGammaRamp && !(pGDev->flFlags & PDEV_GAMMARAMP_TABLE)) { // If the above is true and we have nothing allocated, create it. pGDev->pvGammaRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); pGDev->flFlags |= PDEV_GAMMARAMP_TABLE; } - // - // Need to adjust the input Ramp with internal brightness before copy. - // ICM subkey sets internal brightness, gamma range 128 or 256 during icm init. RtlCopyMemory( pGDev->pvGammaRamp, Ramp, sizeof(GAMMARAMP)); Ret = UpdateDeviceGammaRamp(hPDev); @@ -290,7 +321,7 @@ return Ret; } else - return FALSE; + return Ret; } BOOL @@ -341,7 +372,7 @@ return FALSE; } - Ret = IntSetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp); + Ret = IntSetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp, TRUE); DC_UnlockDc(dc); ExFreePool(SafeRamp); return Ret;

1 0

[jimtabor] 31485: Add Get/SetLayout to psdk.
by jimtabor＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: jimtabor Date: Sat Dec 29 09:34:19 2007 New Revision: 31485 URL: http://svn.reactos.org/svn/reactos?rev=31485&view=rev Log: Add Get/SetLayout to psdk. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Sat Dec 29 09:34:19 2007 @@ -2995,6 +2995,10 @@ BOOL WINAPI SetICMProfileW(HDC,LPWSTR); int WINAPI SetMapMode(HDC,int); DWORD WINAPI SetMapperFlags(HDC,DWORD); +#if (_WIN32_WINNT >= 0x0500) +DWORD WINAPI SetLayout(HDC,DWORD); +DWORD WINAPI GetLayout(HDC); +#endif HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE *); int WINAPI SetMetaRgn(HDC); BOOL WINAPI SetMiterLimit(HDC,FLOAT,PFLOAT);

1 0

[jimtabor] 31484: Fix GetkerningPairsA, so it can handle null count and pointer. Fix export problem for user32.
by jimtabor＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: jimtabor Date: Sat Dec 29 09:27:19 2007 New Revision: 31484 URL: http://svn.reactos.org/svn/reactos?rev=31484&view=rev Log: Fix GetkerningPairsA, so it can handle null count and pointer. Fix export problem for user32. Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/dll/win32/gdi32/objects/palette.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Sat Dec 29 09:27:19 2007 @@ -6,6 +6,7 @@ <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <library>ntdll</library> + <library>user32</library> <library>kernel32</library> <library>advapi32</library> <library>win32ksys</library> Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sat Dec 29 09:27:19 2007 @@ -1174,8 +1174,10 @@ } DPRINT("charset %d => codepage %u\n", charset, csi.ciACP); - total_kern_pairs = GetKerningPairsW(hDC, 0, NULL); + total_kern_pairs = NtGdiGetKerningPairs(hDC, 0, NULL); if (!total_kern_pairs) return 0; + + if (!cPairs && !kern_pairA) return total_kern_pairs; kern_pairW = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW)); GetKerningPairsW(hDC, total_kern_pairs, kern_pairW); Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c Sat Dec 29 09:27:19 2007 @@ -86,10 +86,7 @@ } } #endif -// return UserRealizePalette(hDC); - -//HACK!!!!! - return NtGdiRealizePalette(hDC); + return UserRealizePalette(hDC); }

1 0

[pschweitzer] 31483: Reorganized NTFS driver header : - Renamed Magic (bad !) to jump, and OemName to OEMID - Created structures for BPB and EBPB and used them in BOOT_SECTOR one - Added a field to BOOY_SECTOR structure This is based on Technet doc and Alex Ionescu doc
by pschweitzer＠svn.reactos.org 28 Dec '07

28 Dec '07

Author: pschweitzer Date: Sat Dec 29 00:56:19 2007 New Revision: 31483 URL: http://svn.reactos.org/svn/reactos?rev=31483&view=rev Log: Reorganized NTFS driver header : - Renamed Magic (bad !) to jump, and OemName to OEMID - Created structures for BPB and EBPB and used them in BOOT_SECTOR one - Added a field to BOOY_SECTOR structure This is based on Technet doc and Alex Ionescu doc Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Dec 29 00:56:19 2007 @@ -20,7 +20,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/ntfs/fsctl.c + * FILE: drivers/filesystems/ntfs/fsctl.c * PURPOSE: NTFS filesystem driver * PROGRAMMER: Eric Kohl * Updated by Valentin Verkhovsky 2003/09/12 @@ -106,8 +106,8 @@ TRUE); if (NT_SUCCESS(Status)) { - DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OemName); - if (RtlCompareMemory(BootSector->OemName, "NTFS ", 8) != 8) + DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OEMID); + if (RtlCompareMemory(BootSector->OEMID, "NTFS ", 8) != 8) { Status = STATUS_UNRECOGNIZED_VOLUME; } @@ -170,33 +170,33 @@ } /* Read data from the bootsector */ - NtfsInfo->BytesPerSector = BootSector->BytesPerSector; - NtfsInfo->SectorsPerCluster = BootSector->SectorsPerCluster; - NtfsInfo->BytesPerCluster = BootSector->BytesPerSector * BootSector->SectorsPerCluster; - NtfsInfo->SectorCount = BootSector->SectorCount; - - NtfsInfo->MftStart.QuadPart = BootSector->MftLocation; - NtfsInfo->MftMirrStart.QuadPart = BootSector->MftMirrLocation; - NtfsInfo->SerialNumber = BootSector->SerialNumber; - if (BootSector->ClustersPerMftRecord > 0) - NtfsInfo->BytesPerFileRecord = BootSector->ClustersPerMftRecord * NtfsInfo->BytesPerCluster; + NtfsInfo->BytesPerSector = BootSector->BPB.BytesPerSector; + NtfsInfo->SectorsPerCluster = BootSector->BPB.SectorsPerCluster; + NtfsInfo->BytesPerCluster = BootSector->BPB.BytesPerSector * BootSector->BPB.SectorsPerCluster; + NtfsInfo->SectorCount = BootSector->EBPB.SectorCount; + + NtfsInfo->MftStart.QuadPart = BootSector->EBPB.MftLocation; + NtfsInfo->MftMirrStart.QuadPart = BootSector->EBPB.MftMirrLocation; + NtfsInfo->SerialNumber = BootSector->EBPB.SerialNumber; + if (BootSector->EBPB.ClustersPerMftRecord > 0) + NtfsInfo->BytesPerFileRecord = BootSector->EBPB.ClustersPerMftRecord * NtfsInfo->BytesPerCluster; else - NtfsInfo->BytesPerFileRecord = 1 << (-BootSector->ClustersPerMftRecord); + NtfsInfo->BytesPerFileRecord = 1 << (-BootSector->EBPB.ClustersPerMftRecord); //#ifndef NDEBUG DbgPrint("Boot sector information:\n"); - DbgPrint(" BytesPerSector: %hu\n", BootSector->BytesPerSector); - DbgPrint(" SectorsPerCluster: %hu\n", BootSector->SectorsPerCluster); - - DbgPrint(" SectorCount: %I64u\n", BootSector->SectorCount); - - DbgPrint(" MftStart: %I64u\n", BootSector->MftLocation); - DbgPrint(" MftMirrStart: %I64u\n", BootSector->MftMirrLocation); - - DbgPrint(" ClustersPerMftRecord: %lx\n", BootSector->ClustersPerMftRecord); - DbgPrint(" ClustersPerIndexRecord: %lx\n", BootSector->ClustersPerIndexRecord); - - DbgPrint(" SerialNumber: %I64x\n", BootSector->SerialNumber); + DbgPrint(" BytesPerSector: %hu\n", BootSector->BPB.BytesPerSector); + DbgPrint(" SectorsPerCluster: %hu\n", BootSector->BPB.SectorsPerCluster); + + DbgPrint(" SectorCount: %I64u\n", BootSector->EBPB.SectorCount); + + DbgPrint(" MftStart: %I64u\n", BootSector->EBPB.MftLocation); + DbgPrint(" MftMirrStart: %I64u\n", BootSector->EBPB.MftMirrLocation); + + DbgPrint(" ClustersPerMftRecord: %lx\n", BootSector->EBPB.ClustersPerMftRecord); + DbgPrint(" ClustersPerIndexRecord: %lx\n", BootSector->EBPB.ClustersPerIndexRecord); + + DbgPrint(" SerialNumber: %I64x\n", BootSector->EBPB.SerialNumber); //#endif ExFreePool(BootSector); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Sat Dec 29 00:56:19 2007 @@ -20,28 +20,40 @@ #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #include <pshpack1.h> -typedef struct _BOOT_SECTOR -{ - UCHAR Magic[3]; // 0x00 - UCHAR OemName[8]; // 0x03 +typedef struct _BIOS_PARAMETERS_BLOCK +{ USHORT BytesPerSector; // 0x0B - UCHAR SectorsPerCluster; // 0x0D + UCHAR SectorsPerCluster; // 0x0D UCHAR Unused0[7]; // 0x0E UCHAR MediaId; // 0x15 UCHAR Unused1[2]; // 0x16 - USHORT SectorsPerTrack; - USHORT Heads; - UCHAR Unused2[8]; - UCHAR Unknown0[4]; /* always 80 00 80 00 */ - ULONGLONG SectorCount; - ULONGLONG MftLocation; - ULONGLONG MftMirrLocation; - CHAR ClustersPerMftRecord; - UCHAR Unused3[3]; - CHAR ClustersPerIndexRecord; - UCHAR Unused4[3]; + USHORT SectorsPerTrack; // 0x18 + USHORT Heads; // 0x1A + UCHAR Unused2[8]; // 0x1C +} BIOS_PARAMETERS_BLOCK, *PBIOS_PARAMETERS_BLOCK; + +typedef struct _EXTENDED_BIOS_PARAMETERS_BLOCK +{ + UCHAR Unknown[4]; // 0x24, always 80 00 80 00 + ULONGLONG SectorCount; // 0x28 + ULONGLONG MftLocation; // 0x30 + ULONGLONG MftMirrLocation; // 0x38 + CHAR ClustersPerMftRecord; // 0x40 + UCHAR Unused3[3]; // 0x41 + CHAR ClustersPerIndexRecord; // 0x44 + UCHAR Unused4[3]; // 0x45 ULONGLONG SerialNumber; // 0x48 - UCHAR BootCode[432]; // 0x50 + UCHAR Checksum[4]; // 0x50 +} EXTENDED_BIOS_PARAMETERS_BLOCK, *PEXTENDED_BIOS_PARAMETERS_BLOCK; + +typedef struct _BOOT_SECTOR +{ + UCHAR Jump[3]; // 0x00 + UCHAR OEMID[8]; // 0x03 + BIOS_PARAMETERS_BLOCK BPB; + EXTENDED_BIOS_PARAMETERS_BLOCK EBPB; + UCHAR BootStrap[426]; // 0x54 + USHORT EndSector; // 0x1FE } BOOT_SECTOR, *PBOOT_SECTOR; #include <poppack.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs