Question about the gphoto2.ds resources

[Paul Vriens]

Marcus Meissner wrote:
> On Thu, Jul 30, 2009 at 10:24:50AM +0200, Marcus Meissner wrote:
>> On Thu, Jul 30, 2009 at 10:17:37AM +0200, Paul Vriens wrote:
>>> Hi Marcus,
>>>
>>> I've noticed some strange output with transl:
>>>
>>> http://source.winehq.org/transl/resource.php?lang=013%3A00&resfile=dlls%2Fgphoto2.ds&type=5&id=1025&compare=
>>>
>>> When I look at the defined resources for the first dialog I see:
>>>
>>> IDD_CAMERAUI DIALOG DISCARDABLE  0, 0, 372, 273
>>> STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
>>>     WS_CAPTION | WS_SYSMENU
>>> CAPTION "Files on Camera"
>>> MENU 20545
>>>
>>> That MENU however is not defined anywhere.
>>>
>>> Can you remember (2006!) why that MENU entry was put in there?
>>>
>>> Mind you, I think transl should be able to cope with it, but I'm just 
>>> checking if that entry can be removed.
>> I think it is defined, see ui.c:
>>
>>         return DialogBoxW(GPHOTO2_instance,
>> 	                        (LPWSTR)MAKEINTRESOURCE(IDD_CAMERAUI),NULL, DialogProc);
> 
> Ok, I see you mean the MENU 20545 ... That code is from Aric ;)
> 
> Aric?
> 
> Ciao, Marcus

Yes, I meant that "MENU 20545".

FWIW, I found the bug in transl and will submit it as a patch once AJ is 
back and I know which direction I should take with the "pedantic" mode:

diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php
index c19087f..a7af016 100644
--- a/transl/php/lib_res.php
+++ b/transl/php/lib_res.php
@@ -721,8 +721,8 @@ class DialogResource extends Resource
          $this->cy = get_word($data);

          $pos = 0;
-        $this->menuName = get_stringorid($data, $pos, 0xff00);
-        $this->className = get_stringorid($data, $pos, 0xff00);
+        $this->menuName = get_stringorid($data, $pos);
+        $this->className = get_stringorid($data, $pos);
          $this->title = get_stringorid($data, $pos, 0xff00);
          $data = substr($data, $pos);

-- 
Cheers,

Paul.