From bc5c2164d6adbe170ff304ca9775c172cbc96fc4 Mon Sep 17 00:00:00 2001
From: Merlin <158784988+merlinz01@users.noreply.github.com>
Date: Thu, 25 Sep 2025 17:12:03 -0400
Subject: [PATCH 1/4] Improve VerQueryValueA example

Improve formatting and clarity of comments
---
 .../winver/nf-winver-verqueryvaluea.md        | 71 +++++++++++--------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/sdk-api-src/content/winver/nf-winver-verqueryvaluea.md b/sdk-api-src/content/winver/nf-winver-verqueryvaluea.md
index 6b654bd78a4c..a7a438cf13e9 100644
--- a/sdk-api-src/content/winver/nf-winver-verqueryvaluea.md
+++ b/sdk-api-src/content/winver/nf-winver-verqueryvaluea.md
@@ -154,48 +154,59 @@ Be sure to call the <a href="/windows/desktop/api/winver/nf-winver-getfileversio
 
 
 ```cpp
+
 // Structure used to store enumerated languages and code pages.
+typedef struct {
+	WORD wLanguage;
+	WORD wCodePage;
+} LANGANDCODEPAGE;
 
+LANGANDCODEPAGE *lpTranslations;
+UINT cbTranslations;
 HRESULT hr;
-
-struct LANGANDCODEPAGE {
-  WORD wLanguage;
-  WORD wCodePage;
-} *lpTranslate;
+BOOL exists;
+TCHAR *lpBuffer;
+DWORD dwBytes;
 
 // Read the list of languages and code pages.
-
-VerQueryValue(pBlock, 
-              TEXT("\\VarFileInfo\\Translation"),
-              (LPVOID*)&lpTranslate,
-              &cbTranslate);
-
-// Read the file description for each language and code page.
-
-for( i=0; i < (cbTranslate/sizeof(struct LANGANDCODEPAGE)); i++ )
+exists = VerQueryValue(
+	pBlock,
+	TEXT("\\VarFileInfo\\Translation"),
+	(LPVOID*)&lpTranslations,
+	&cbTranslations);
+if (!exists)
+{
+	// No translation information.
+}
+else
 {
-  hr = StringCchPrintf(SubBlock, 50,
-            TEXT("\\StringFileInfo\\%04x%04x\\FileDescription"),
-            lpTranslate[i].wLanguage,
-            lpTranslate[i].wCodePage);
+	// Read the file description for each language and code page.
+	for( i=0; i < (cbTranslations/sizeof(struct LANGANDCODEPAGE)); i++ )
+	{
+	hr = StringCchPrintf(
+		SubBlock,
+		50,
+		TEXT("\\StringFileInfo\\%04x%04x\\FileDescription"),
+		lpTranslations[i].wLanguage,
+		lpTranslations[i].wCodePage);
 	if (FAILED(hr))
 	{
-	// TODO: write error handler.
+		// Handle error
+	}
+	
+	// Retrieve file description for language and code page "i". 
+	exists = VerQueryValue(
+		pBlock, 
+		SubBlock, 
+		&lpBuffer, 
+		&dwBytes);
+    if (exists)
+    {
+		// Do something with the data.
 	}
-
-  // Retrieve file description for language and code page "i". 
-  VerQueryValue(pBlock, 
-                SubBlock, 
-                &lpBuffer, 
-                &dwBytes); 
 }
 ```
 
-
-
-
-
-
 > [!NOTE]
 > The winver.h header defines VerQueryValue as an alias that automatically selects the ANSI or Unicode version of this function based on the definition of the UNICODE preprocessor constant. Mixing usage of the encoding-neutral alias with code that is not encoding-neutral can lead to mismatches that result in compilation or runtime errors. For more information, see [Conventions for Function Prototypes](/windows/win32/intl/conventions-for-function-prototypes).
 

From a68810295ee292e1d48ab309df810f79432df47d Mon Sep 17 00:00:00 2001
From: Merlin <158784988+merlinz01@users.noreply.github.com>
Date: Thu, 25 Sep 2025 17:18:43 -0400
Subject: [PATCH 2/4] Improve VerQueryValueW example

Improve formatting and clarity of comments
---
 .../winver/nf-winver-verqueryvaluew.md        | 66 ++++++++++++-------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/sdk-api-src/content/winver/nf-winver-verqueryvaluew.md b/sdk-api-src/content/winver/nf-winver-verqueryvaluew.md
index 9f75797aa443..5c89c4332e5f 100644
--- a/sdk-api-src/content/winver/nf-winver-verqueryvaluew.md
+++ b/sdk-api-src/content/winver/nf-winver-verqueryvaluew.md
@@ -169,40 +169,56 @@ Be sure to call the <a href="/windows/desktop/api/winver/nf-winver-getfileversio
 
 
 ```cpp
+
 // Structure used to store enumerated languages and code pages.
+typedef struct {
+	WORD wLanguage;
+	WORD wCodePage;
+} LANGANDCODEPAGE;
 
+LANGANDCODEPAGE *lpTranslations;
+UINT cbTranslations;
 HRESULT hr;
-
-struct LANGANDCODEPAGE {
-  WORD wLanguage;
-  WORD wCodePage;
-} *lpTranslate;
+BOOL exists;
+TCHAR *lpBuffer;
+DWORD dwBytes;
 
 // Read the list of languages and code pages.
-
-VerQueryValue(pBlock, 
-              TEXT("\\VarFileInfo\\Translation"),
-              (LPVOID*)&lpTranslate,
-              &cbTranslate);
-
-// Read the file description for each language and code page.
-
-for( i=0; i < (cbTranslate/sizeof(struct LANGANDCODEPAGE)); i++ )
+exists = VerQueryValue(
+	pBlock,
+	TEXT("\\VarFileInfo\\Translation"),
+	(LPVOID*)&lpTranslations,
+	&cbTranslations);
+if (!exists)
 {
-  hr = StringCchPrintf(SubBlock, 50,
-            TEXT("\\StringFileInfo\\%04x%04x\\FileDescription"),
-            lpTranslate[i].wLanguage,
-            lpTranslate[i].wCodePage);
+	// No translation information.
+}
+else
+{
+	// Read the file description for each language and code page.
+	for( i=0; i < (cbTranslations/sizeof(struct LANGANDCODEPAGE)); i++ )
+	{
+	hr = StringCchPrintf(
+		SubBlock,
+		50,
+		TEXT("\\StringFileInfo\\%04x%04x\\FileDescription"),
+		lpTranslations[i].wLanguage,
+		lpTranslations[i].wCodePage);
 	if (FAILED(hr))
 	{
-	// TODO: write error handler.
+		// Handle error
+	}
+	
+	// Retrieve file description for language and code page "i". 
+	exists = VerQueryValue(
+		pBlock, 
+		SubBlock, 
+		&lpBuffer, 
+		&dwBytes);
+    if (exists)
+    {
+		// Do something with the data.
 	}
-
-  // Retrieve file description for language and code page "i". 
-  VerQueryValue(pBlock, 
-                SubBlock, 
-                &lpBuffer, 
-                &dwBytes); 
 }
 ```
 

From 04d88c3ddf5e369aaada76c01f648ffc39c2b12e Mon Sep 17 00:00:00 2001
From: Merlin <158784988+merlinz01@users.noreply.github.com>
Date: Thu, 25 Sep 2025 17:19:46 -0400
Subject: [PATCH 3/4] Add missing variable declaration

---
 sdk-api-src/content/winver/nf-winver-verqueryvaluew.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk-api-src/content/winver/nf-winver-verqueryvaluew.md b/sdk-api-src/content/winver/nf-winver-verqueryvaluew.md
index 5c89c4332e5f..4012edd5e2df 100644
--- a/sdk-api-src/content/winver/nf-winver-verqueryvaluew.md
+++ b/sdk-api-src/content/winver/nf-winver-verqueryvaluew.md
@@ -182,6 +182,7 @@ HRESULT hr;
 BOOL exists;
 TCHAR *lpBuffer;
 DWORD dwBytes;
+TCHAR SubBlock[50];
 
 // Read the list of languages and code pages.
 exists = VerQueryValue(

From 6645ef8021199442ff89af9e80da986db4239252 Mon Sep 17 00:00:00 2001
From: Merlin <158784988+merlinz01@users.noreply.github.com>
Date: Thu, 25 Sep 2025 17:20:23 -0400
Subject: [PATCH 4/4] Add missing variable declaration

---
 sdk-api-src/content/winver/nf-winver-verqueryvaluea.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk-api-src/content/winver/nf-winver-verqueryvaluea.md b/sdk-api-src/content/winver/nf-winver-verqueryvaluea.md
index a7a438cf13e9..da6b3881d40c 100644
--- a/sdk-api-src/content/winver/nf-winver-verqueryvaluea.md
+++ b/sdk-api-src/content/winver/nf-winver-verqueryvaluea.md
@@ -167,6 +167,7 @@ HRESULT hr;
 BOOL exists;
 TCHAR *lpBuffer;
 DWORD dwBytes;
+TCHAR SubBlock[50];
 
 // Read the list of languages and code pages.
 exists = VerQueryValue(