diff --git a/Compare.c b/Compare.c index 9695924..c5ef9e1 100644 --- a/Compare.c +++ b/Compare.c @@ -8,6 +8,7 @@ #include #include + #pragma comment(lib, "Winmm.lib") //#define DEBUG_PRINTF 1 @@ -25,6 +26,7 @@ typedef struct { wchar_t pathWav1[_MAX_PATH]; wchar_t pathWav2[_MAX_PATH]; BOOL error; + int number; } tCompareStruct; @@ -83,7 +85,7 @@ static BOOL CALLBACK enum_wnd_proc(HWND hwnd, LPARAM lParam) { if (compareStruct->regim == REGIM_INIT) { - if ((wcscmp(classText, L"Edit") == 0) && (LocalTop == 37)) { + if ((wcscmp(classText, L"Edit") == 0) && (compareStruct->number == 4)) { #ifdef DEBUG_PRINTF printf("Edit1 found!\n"); @@ -96,7 +98,7 @@ static BOOL CALLBACK enum_wnd_proc(HWND hwnd, LPARAM lParam) { } } - if ((wcscmp(classText, L"Edit") == 0) && (LocalTop == 73)) { + if ((wcscmp(classText, L"Edit") == 0) && (compareStruct->number == 5)) { #ifdef DEBUG_PRINTF printf("Edit2 found!\n"); #endif @@ -108,7 +110,7 @@ static BOOL CALLBACK enum_wnd_proc(HWND hwnd, LPARAM lParam) { } } - if ((wcscmp(classText, L"ComboBox") == 0) && (LocalTop == 109)) { + if ((wcscmp(classText, L"ComboBox") == 0) && (compareStruct->number == 18)) { #ifdef DEBUG_PRINTF printf("ComboBox1 found!\n"); #endif @@ -121,7 +123,7 @@ static BOOL CALLBACK enum_wnd_proc(HWND hwnd, LPARAM lParam) { } } - if ((wcscmp(classText, L"ComboBox") == 0) && (LocalTop == 184)) { + if ((wcscmp(classText, L"ComboBox") == 0) && (compareStruct->number == 23)) { #ifdef DEBUG_PRINTF printf("ComboBox2 found!\n"); #endif @@ -134,7 +136,7 @@ static BOOL CALLBACK enum_wnd_proc(HWND hwnd, LPARAM lParam) { } } - if ((wcscmp(classText, L"Static") == 0) && (LocalTop == 218)) { + if ((wcscmp(classText, L"Static") == 0) && (compareStruct->number == 15)) { #ifdef DEBUG_PRINTF printf("Static found!\n"); #endif @@ -153,7 +155,7 @@ static BOOL CALLBACK enum_wnd_proc(HWND hwnd, LPARAM lParam) { if (compareStruct->regim == REGIM_COMPARE) { - if ((wcscmp(classText, L"Button") == 0) && (LocalTop == 221)) { + if ((wcscmp(classText, L"Button") == 0) && (compareStruct->number == 17)) { #ifdef DEBUG_PRINTF printf("Button found!\n"); #endif @@ -170,7 +172,7 @@ static BOOL CALLBACK enum_wnd_proc(HWND hwnd, LPARAM lParam) { if (compareStruct->regim == REGIM_RESULT) { - if ((wcscmp(classText, L"Static") == 0) && (LocalTop == 218)) { + if ((wcscmp(classText, L"Static") == 0) && (compareStruct->number == 15)) { #ifdef DEBUG_PRINTF printf("Static found!\n"); #endif @@ -193,6 +195,8 @@ static BOOL CALLBACK enum_wnd_proc(HWND hwnd, LPARAM lParam) { } } + ++compareStruct->number; + return TRUE; } @@ -260,15 +264,18 @@ static int wmain(int argc, wchar_t* argv[], wchar_t* envp[]) { GetWindowRect(hwnd, &compareStruct.winRect); compareStruct.regim = REGIM_INIT; + compareStruct.number = 0; EnumChildWindows(hwnd, enum_wnd_proc, (LPARAM)(&compareStruct)); if (compareStruct.error) return 3; compareStruct.regim = REGIM_COMPARE; + compareStruct.number = 0; EnumChildWindows(hwnd, enum_wnd_proc, (LPARAM)(&compareStruct)); compareStruct.regim = REGIM_RESULT; + compareStruct.number = 0; EnumChildWindows(hwnd, enum_wnd_proc, (LPARAM)(&compareStruct)); timeKillEvent(timerUpdate); diff --git a/Compare/Release/Compare.iobj b/Compare/Release/Compare.iobj index f37c53a..70eca89 100644 Binary files a/Compare/Release/Compare.iobj and b/Compare/Release/Compare.iobj differ diff --git a/Compare/Release/Compare.ipdb b/Compare/Release/Compare.ipdb index 8885643..1acc0df 100644 Binary files a/Compare/Release/Compare.ipdb and b/Compare/Release/Compare.ipdb differ diff --git a/Compare/Release/Compare.log b/Compare/Release/Compare.log index 99b90c1..04f9641 100644 --- a/Compare/Release/Compare.log +++ b/Compare/Release/Compare.log @@ -1,14 +1,14 @@  Compare.c -C:\VC\Compare\Compare.c(38,36): warning C4047: функция: "LPARAM" отличается по уровням косвенного обращения от "LPCWSTR" -C:\VC\Compare\Compare.c(38,36): warning C4024: SendMessageW: различные типы для формального и фактического параметров 4 -C:\VC\Compare\Compare.c(39,44): warning C4047: функция: "LPARAM" отличается по уровням косвенного обращения от "wchar_t [260]" -C:\VC\Compare\Compare.c(39,44): warning C4024: SendMessageW: различные типы для формального и фактического параметров 4 -C:\VC\Compare\Compare.c(181,46): warning C4047: функция: "LPARAM" отличается по уровням косвенного обращения от "wchar_t [260]" -C:\VC\Compare\Compare.c(181,46): warning C4024: SendMessageW: различные типы для формального и фактического параметров 4 -C:\VC\Compare\Compare.c(295,1): warning C4008: wmain: пропуск атрибута "static" +C:\VC\Compare\Compare.c(40,36): warning C4047: функция: "LPARAM" отличается по уровням косвенного обращения от "LPCWSTR" +C:\VC\Compare\Compare.c(40,36): warning C4024: SendMessageW: различные типы для формального и фактического параметров 4 +C:\VC\Compare\Compare.c(41,44): warning C4047: функция: "LPARAM" отличается по уровням косвенного обращения от "wchar_t [260]" +C:\VC\Compare\Compare.c(41,44): warning C4024: SendMessageW: различные типы для формального и фактического параметров 4 +C:\VC\Compare\Compare.c(183,46): warning C4047: функция: "LPARAM" отличается по уровням косвенного обращения от "wchar_t [260]" +C:\VC\Compare\Compare.c(183,46): warning C4024: SendMessageW: различные типы для формального и фактического параметров 4 +C:\VC\Compare\Compare.c(302,1): warning C4008: wmain: пропуск атрибута "static" Создание кода Создание кода завершено - 2 of 8 functions (25.0%) were compiled, the rest were copied from previous compilation. + 1 of 8 functions (12.5%) were compiled, the rest were copied from previous compilation. 0 functions were new in current compilation - 0 functions had inline decision re-evaluated but remain unchanged + 1 functions had inline decision re-evaluated but remain unchanged Compare.vcxproj -> C:\VC\Compare\Release\Compare.exe diff --git a/Compare/Release/Compare.obj b/Compare/Release/Compare.obj index c633c0e..1100b7e 100644 Binary files a/Compare/Release/Compare.obj and b/Compare/Release/Compare.obj differ diff --git a/Compare/Release/vc143.pdb b/Compare/Release/vc143.pdb index 25d7bf6..92443cf 100644 Binary files a/Compare/Release/vc143.pdb and b/Compare/Release/vc143.pdb differ diff --git a/Release/Compare.exe b/Release/Compare.exe index 19e3839..92ba391 100644 Binary files a/Release/Compare.exe and b/Release/Compare.exe differ diff --git a/Release/Compare.pdb b/Release/Compare.pdb index 6f576e9..23082d0 100644 Binary files a/Release/Compare.pdb and b/Release/Compare.pdb differ