--- Merging r22953 into '.':

U    utils/debugsvr/debugserverintf.pp
--- Merging r22979 into '.':
U    packages/winunits-base/src/commctrl.pp
--- Merging r23420 into '.':
U    packages/winunits-base/src/shlobj.pp
--- Merging r23499 into '.':
U    rtl/inc/fexpand.inc

# revisions: 22953,22979,23420,23499
r22953 | marco | 2012-11-08 17:17:55 +0100 (Thu, 08 Nov 2012) | 2 lines
Changed paths:
   M /trunk/utils/debugsvr/debugserverintf.pp

 * make socket stuff compiling again. Package not 100% yet due to gtk1 dependencies.
r22979 | marco | 2012-11-11 19:16:32 +0100 (Sun, 11 Nov 2012) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/commctrl.pp

 * fix for mantis #22283, Wrong bit shift in ListView_GetCheckState  (shl instead of shr)
r23420 | marco | 2013-01-17 09:46:39 +0100 (Thu, 17 Jan 2013) | 2 lines
Changed paths:
   M /trunk/packages/winunits-base/src/shlobj.pp

 * two constants added.
r23499 | hajny | 2013-01-23 00:56:42 +0100 (Wed, 23 Jan 2013) | 1 line
Changed paths:
   M /trunk/rtl/inc/fexpand.inc

 * fix for standalone '~' with HOME=/ on Unix

git-svn-id: branches/fixes_2_6@23877 -

packages/winunits-base/src/commctrl.pp

@@ -10966,7 +10966,7 @@ end;
 Function ListView_GetCheckState( hwndLV : hwnd; i : WPARAM):UINT;
 
 Begin
- Result:=(SendMessage((hwndLV), LVM_GETITEMSTATE, (i), LVIS_STATEIMAGEMASK) shl 12) -1;
+ Result:=(SendMessage((hwndLV), LVM_GETITEMSTATE, (i), LVIS_STATEIMAGEMASK) shr 12) -1;
 end;
 
 

packages/winunits-base/src/shlobj.pp

@@ -876,6 +876,8 @@ Const
   FOS_FORCESHOWHIDDEN     = $10000000;
   FOS_DEFAULTNOMINIMODE	  = $20000000;
   FOS_FORCEPREVIEWPANEON  = $40000000;
+  SHGFP_TYPE_CURRENT      =  0;   // shgetfolderpath, current value for user, verify it exists
+  SHGFP_TYPE_DEFAULT  	  =  1;   // shgetfolderpath, default value, may not exist
    
 Type
       SFGAOF  = ULONG;

rtl/inc/fexpand.inc

@@ -161,7 +161,7 @@ begin
             S := GetEnv ('HOME');
   {$ENDIF FPC_FEXPAND_GETENV_PCHAR}
  {$ENDIF FPC_FEXPAND_SYSUTILS}
-            if (S = '') or (Length (S) = 1)
+            if (S = '') or (Length (S) = 1) and (Length (Pa) > 1)
                                           and (S [1] = DirectorySeparator) then
                 Delete (Pa, 1, 1)
             else

utils/debugsvr/debugserverintf.pp

@@ -113,16 +113,16 @@ var
 
 begin
   FFileName:=DebugSocket;
-  FSocket:=Socket(AF_UNIX,SOCK_STREAM,0);
+  FSocket:=FPSocket(AF_UNIX,SOCK_STREAM,0);
   If FSocket<0 Then
     Raise Exception.Create(SErrSocketFailed);
   Flags:=fpFCntl(FSOCket,F_GETFL);
   Flags:=Flags or O_NONBLOCK;
   fpFCntl(FSocket,F_SETFL,Flags);
   Str2UnixSockAddr(FFilename,FUnixAddr,AddrLen);
-  If Not Bind(FSocket,FUnixAddr,AddrLen) then
+  If FPBind(FSocket,@FUnixAddr,AddrLen)<>0 then
      Raise Exception.CreateFmt(SErrBindFailed,[FFileName]);
-  If Not (Listen(FSocket,5)) then
+  If (fpListen(FSocket,5)<>0) then
     Raise Exception.CreateFmt(SErrListenFailed,[FSocket]);
   FClients:=TList.Create;
   Accepting:=True;
@@ -162,7 +162,7 @@ var
   Quit : Boolean;
 
 begin
-  FSocket:=Socket(AF_INET,SOCK_STREAM,0);
+  FSocket:=FPSocket(AF_INET,SOCK_STREAM,0);
   If FSocket<0 Then
     Raise Exception.Create(SErrSocketFailed);
   Flags:=fpFCntl(FSocket,F_GETFL);
@@ -172,9 +172,9 @@ begin
   Writeln('Using port : ',APort);
   FInetAddr.Port := Swap(APort);
   FInetAddr.Addr := 0;
-  If Not Bind(FSocket,FInetAddr,SizeOf(FInetAddr)) then
+  If FPBind(FSocket,@FInetAddr,SizeOf(FInetAddr))<>0 then
      Raise Exception.CreateFmt(SErrBindFailed,[FFileName]);
-  If Not (Listen(FSocket,5)) then
+  If fpListen(FSocket,5)<>0 then
     Raise Exception.CreateFmt(SErrListenFailed,[FSocket]);
 end;
 
@@ -241,7 +241,7 @@ begin
   If Accepting then
     begin
     L:=SizeOf(ClientAddr);
-    Result:=Accept(FSocket,ClientAddr,L);
+    Result:=fpAccept(FSocket,@ClientAddr,@L);
     If (Result<0) Then
       if (Errno<>ESYSEAgain) then
         Raise Exception.CreateFmt(SErrAcceptFailed,[FSocket])
@@ -280,7 +280,7 @@ end;
 Procedure CloseClientHandle(Handle : THandle);
 
 begin
-  ShutDown(Handle,2);
+  fpShutDown(Handle,2);
   FileClose(Handle);
 end;