[PATCH 1/2] reg: simplify root key search

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

This patch still fails to apply with the same error:

stefan at retina ~/src/wine $ git am /dev/shm/\[PATCH\ 1_2\]\ reg\:\
simplify\ root\ key\ search.eml
Applying: reg: simplify root key search
/home/stefan/src/wine/.git/rebase-apply/patch:14: trailing whitespace.
static const WCHAR short_hklm[] = {'H','K','L','M',0};
/home/stefan/src/wine/.git/rebase-apply/patch:15: trailing whitespace.
static const WCHAR short_hkcu[] = {'H','K','C','U',0};
/home/stefan/src/wine/.git/rebase-apply/patch:16: trailing whitespace.
static const WCHAR short_hkcr[] = {'H','K','C','R',0};
/home/stefan/src/wine/.git/rebase-apply/patch:17: trailing whitespace.
static const WCHAR short_hku[] = {'H','K','U',0};
/home/stefan/src/wine/.git/rebase-apply/patch:18: trailing whitespace.
static const WCHAR short_hkcc[] = {'H','K','C','C',0};
error: patch failed: programs/reg/reg.c:22
error: programs/reg/reg.c: patch does not apply
Patch failed at 0001 reg: simplify root key search
The copy of the patch that failed is found in:
   /home/stefan/src/wine/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Stefan
Am 2015-08-31 um 22:09 schrieb Michel Zou:
> Split patch from Jonathan Vollebregt: 
> https://github.com/jnvsor/wine/commit/ea0e2fc70db6ce4904655ea4a27ee34531d96712
>
> 
- ---
> programs/reg/reg.c | 85
> +++++++++++++++++++++++++++--------------------------- 1 file
> changed, 43 insertions(+), 42 deletions(-)
> 
> 
> 
> 
> 
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBAgAGBQJV6Bl1AAoJEN0/YqbEcdMwf+sQAI7u19WiDrPOtniTS00sJZeS
mrBSZHvhKlDujZ4iCr4VHyycBzhCmg8peflfgEHRyF9xGx6duy/mzh0JHN3qJFlM
r7zbm9wbhFCaH7i4d1JD2a7l9hthow+N3PuPKWk5ox+T+Pe9HaXTQwxUmgB/6YjR
xXjkHDEc5GtyBeqxpiskw2W92GWubrMrEJmfmlQQSWfcIZjkUM0MmKCEUCibMu3O
bLPOsx1AjD3aQ+S0R50D3s1W1u/yO0tfKa0pGki2pqZRL/72UcbBWNow6F9tZIeD
qXaAgNhvn0rc66nMVb7yc//9nN4oN2prBNtrpCtSCCfSgd/Xh47xoq8g3HQUXjHd
nNbfSuePuNLvNzu5XhNb0yP5cGCZedU8q7cYcPURn376t25xw22daigpdId3kaS0
KN+gwb2M1PSazPwkjRy94qIX9Kl0NIsJT8dLHZgV0TM7ZrRBy0sa2baqH5jvL+4h
pCn9+Kcuyv5jC7Oj/ewNx+9EIRmUf7wOJvgdNocUqwSyHPf7bJwZOysAm4ltk8pq
A7RA2qiyicANi34Yf1e8zKG1Fv1M/uYwvjc3Sd8jrTpkn0z9mzijll4R+bcThAXA
jdZjA3HTyvoaaENxmKJngb7Xz2o0WBV1WUEjIIUos+md8IV7bCnH0dbCDtE3AQKl
u/eABCeasbpTQJ61px7N
=V5u2
-----END PGP SIGNATURE-----