586187 - Build failure in LayerManagerD3D9 due to --disable-ipc not also defining Unicode

Status: RESOLVED FIXED

(Core :: IPC, defect)

Description

[Justin Wood (:Callek)]

Attachment: fix

When LayerManagerD3D9 is compiled, the makefile (if MOZ_IPC) ends up defining UNICODE, which is fine. However the code involved assumes the unicode version of CreateWindow is utilized.

This fails in a --disable-ipc build due to the non-unicode version of CreateWindow getting used, and thus a paramater conversion error.  This patch just uses CreateWindowW directly.

the patch has rs+=khuey over IRC, requesting here for posterity.

Whoever pushes feel free to update the commit message in a sane way (e.g. include the bug # of this bug)

Comment 1

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 464712 [details] [diff] [review]
fix

>-  mFocusWnd = CreateWindow(kClassName, L"D3D9Window", WS_OVERLAPPEDWINDOW,
>+  mFocusWnd = ::CreateWindowW(kClassName, L"D3D9Window", WS_OVERLAPPEDWINDOW,
>                            CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL,
>                            NULL, GetModuleHandle(NULL), NULL);

Nit: line the continuations of the call up again.

rs=me (though this isn't really my code.)

Could you file a Core::Build Config followup on AC_DEFINEing UNICODE?

FWIW, I also don't think this needs approval since it's a bustage fix.

Comment 2

[Robert Kaiser]

Pushed as http://hg.mozilla.org/mozilla-central/rev/41b686bb548a

Comment 3

[Justin Wood (:Callek)]

(In reply to comment #1)
> Could you file a Core::Build Config followup on AC_DEFINEing UNICODE?

Filed Bug 589370