Francois,
The reason that these routines were duplicated is that the builtin shell32 cannot find StrRetToBuf{A|W} in some of the native versions of shlwapi.dll. This dependency prohibited testing with builtin vs. native shlwapi.
The change was submitted to winehq about 8/28 and committed soon thereafter.
Guy
----- Original Message ----- From: "Francois Gouget" fgouget@free.fr To: wine-patches@winehq.com Sent: Wednesday, October 31, 2001 11:46 PM Subject: Duplicated StrRetToStr functions in shell32
Shell32 contains StrRetToStrNA and StrRetToStrNW which are almost identical to StrRetToBufA and StrRetToBufW. Since shell32 already imports shlwapi it seems like we should just call the latter functions! That way I won't have to fix the "0x%p" thing twice.
Changelog:
dlls/shell32/shellstring.c
Implement StrRetToStrN{A,W} by calling shlwapi.StrRetToBuf{A,W}
instead of duplicating the code
-- Francois Gouget fgouget@free.fr http://fgouget.free.fr/ I haven't lost my mind, it's backed up on tape around here
somewhere...
On Thu, 1 Nov 2001, Guy L. Albertelli wrote:
Francois,
The reason that these routines were duplicated is that the builtin shell32 cannot find StrRetToBuf{A|W} in some of the native versions of shlwapi.dll. This dependency prohibited testing with builtin vs. native shlwapi.
The change was submitted to winehq about 8/28 and committed soon thereafter.
Aaaah. Ok.
Then I suggest that we add a comment in the source that says so, in both the shell32 and shlwapi implementations. This way when one implementation is updated the others acutally have a chance of being updated too.
-- Francois Gouget fgouget@free.fr http://fgouget.free.fr/ "Utilisateur" (nom commun) : Mot utilisé par les informaticiens en lieu et place d'"idiot".
Francois Gouget wrote:
On Thu, 1 Nov 2001, Guy L. Albertelli wrote:
Francois,
The reason that these routines were duplicated is that the builtin shell32 cannot find StrRetToBuf{A|W} in some of the native versions of shlwapi.dll. This dependency prohibited testing with builtin vs. native shlwapi.
The change was submitted to winehq about 8/28 and committed soon thereafter.
Aaaah. Ok.
Then I suggest that we add a comment in the source that says so, in both the shell32 and shlwapi implementations. This way when one implementation is updated the others acutally have a chance of being updated too.
So why don't you implement it once and include the implementation twice, one time in shell32, the other time in shlwapi ? This could be either accomplished via #include or via a "vpath" in the Makefile.
Dominik