[PATCH] comdlg32: Change "Borders" to "Margins".

[Alex Henrie]

2015-04-28 8:03 GMT-06:00 Alexandre Julliard <julliard at winehq.org>:
> Alex Henrie <alexhenrie24 at gmail.com> writes:
>
>> Alexandre,
>>
>> What was wrong with this patch that you did not accept it?
>
> I'm concerned that you have been looking at Windows a bit too much.

At first, I thought that Wine actually used this string. On closer
look, it seems that Wine always replaces the dialog's string "Borders"
with the string resource "Margins [inches]" or "Margins [mm]":

https://source.winehq.org/git/wine.git/blob/abd673bde93b76a361ddf7342c538c2dd99af2bd:/dlls/comdlg32/printdlg.c#l3280
https://source.winehq.org/git/wine.git/blob/abd673bde93b76a361ddf7342c538c2dd99af2bd:/dlls/comdlg32/comdlg32.rc#l78

The following test (run with `./wine dlls/comdlg32/tests/comdlg32_test.exe.so printdlg`)
also supports the hypothesis that Wine always overrides the dialog's
string:

diff --git a/dlls/comdlg32/comdlg32.rc b/dlls/comdlg32/comdlg32.rc
index d3deeab..9d37d69 100644
--- a/dlls/comdlg32/comdlg32.rc
+++ b/dlls/comdlg32/comdlg32.rc
@@ -438,7 +438,7 @@ BEGIN
   GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX
   AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
-  GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  GROUPBOX "foobar", grp4, 80, 156, 152, 56, BS_GROUPBOX
   LTEXT "L&eft:", stc15, 88, 172, 30, 8
   EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
   LTEXT "&Right:", stc16, 159, 172, 30, 8
diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c
index 7e06c97..d6c7dff 100644
--- a/dlls/comdlg32/tests/printdlg.c
+++ b/dlls/comdlg32/tests/printdlg.c
@@ -88,7 +88,7 @@ static void test_PageSetupDlgA(void)
 
     ZeroMemory(pDlg, sizeof(PAGESETUPDLGA));
     pDlg->lStructSize = sizeof(PAGESETUPDLGA);
-    pDlg->Flags = PSD_RETURNDEFAULT | PSD_NOWARNING;
+    pDlg->Flags = PSD_NOWARNING;
     SetLastError(0xdeadbeef);
     res = PageSetupDlgA(pDlg);
     ok( res || (CommDlgExtendedError() == PDERR_NODEFAULTPRN),

If I am correct, it would be better to replace "Borders" with "" so
that translators have one less string to worry about. Is that
acceptable to you?

-Alex