Merge branch 'master' into Sync-weave

1 files changed, 0 insertions, 53 deletions

diff --git a/other-licenses/7zstub/src/Windows/ResourceString.cpp b/other-licenses/7zstub/src/Windows/ResourceString.cpp
deleted file mode 100644
index 679d5ef0e..000000000
--- a/other-licenses/7zstub/src/Windows/ResourceString.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Windows/ResourceString.cpp

-

-#include "StdAfx.h"

-

-#include "Windows/ResourceString.h"

-#ifndef _UNICODE

-#include "Common/StringConvert.h"

-#endif

-

-extern HINSTANCE g_hInstance;

-#ifndef _UNICODE

-extern bool g_IsNT;

-#endif

-

-namespace NWindows {

-

-CSysString MyLoadString(UINT resourceID)

-{

-  CSysString s;

-  int size = 256;

-  int len;

-  do

-  {

-    size += 256;

-    len = ::LoadString(g_hInstance, resourceID, s.GetBuffer(size - 1), size);

-  } 

-  while (size - len <= 1);

-  s.ReleaseBuffer();

-  return s;

-}

-

-#ifndef _UNICODE

-UString MyLoadStringW(UINT resourceID)

-{

-  if (g_IsNT)

-  {

-    UString s;

-    int size = 256;

-    int len;

-    do

-    {

-      size += 256;

-      len = ::LoadStringW(g_hInstance, resourceID, s.GetBuffer(size - 1), size);

-    } 

-    while (size - len <= 1);

-    s.ReleaseBuffer();

-    return s;

-  }

-  return GetUnicodeString(MyLoadString(resourceID));

-}

-#endif

-

-}